X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/23d052c42f43430e4ff776a80b9643dbc7d1289d..0f9dff59858f013c2817b0f919107be86c06020d:/projects/sgconf/main.cpp diff --git a/projects/sgconf/main.cpp b/projects/sgconf/main.cpp index 507abaa5..3fbafa0a 100644 --- a/projects/sgconf/main.cpp +++ b/projects/sgconf/main.cpp @@ -24,30 +24,35 @@ $Date: 2010/03/25 14:37:43 $ */ -#include -#include -#include -#include +#include "request.h" +#include "common_sg.h" +#include "sg_error_codes.h" + +#include "stg/user_conf.h" +#include "stg/user_stat.h" +#include "stg/common.h" #include #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" +#include +#include +#include +#include namespace { template -struct ARRAY_TYPE; +struct ARRAY_TYPE +{ +typedef typename T::value_type type; +}; template struct ARRAY_TYPE @@ -71,13 +76,18 @@ array[pos] = value; return true; } +void Usage(); +void UsageConnection(); +void UsageAdmins(); +void UsageTariffs(); +void UsageUsers(); +void UsageServices(); +void UsageCorporations(); + } // namespace anonymous 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 @@ -149,40 +159,33 @@ 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}}; //----------------------------------------------------------------------------- -double ParseCash(const char * c, string * message) +CASH_INFO ParseCash(const char * str) { //-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) +std::string cashString; +std::string message; +const char * pos = strchr(str, ':'); +if (pos != NULL) { - *message = msg + 1; - str[msg - str] = 0; + cashString.append(str, pos); + message.append(pos + 1); } else - *message = ""; + cashString = str; -if (strtodouble2(str, cash) != 0) +double cash = 0; +if (strtodouble2(cashString, cash) != 0) { - printf("Incorrect cash value %s\n", c); + printf("Incorrect cash value %s\n", str); exit(PARAMETER_PARSING_ERR_CODE); } -delete[] str; -return cash; +return CASH_INFO(cash, message); } //----------------------------------------------------------------------------- double ParseCredit(const char * c) @@ -232,63 +235,24 @@ if (!(dp[1] == 0 && (dp[0] == '1' || dp[0] == '0'))) return dp[0] - '0'; } //----------------------------------------------------------------------------- -string ParseTariff(const char * t, int &chgType) +void ParseTariff(const char * str, RESETABLE & tariffName, RESETABLE & nextTariff) { -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) +const char * pos = strchr(str, ':'); +if (pos != 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); + 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); + } } - -ss = s; -delete[] s; -return ss; +else + tariffName = str; } //----------------------------------------------------------------------------- time_t ParseCreditExpire(const char * str) @@ -379,10 +343,10 @@ memset(str, 0, strLen); r[0] = 0; -if (!req->usrMsg.res_empty()) +if (!req->usrMsg.empty()) { string msg; - Encode12str(msg, req->usrMsg); + 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); @@ -408,25 +372,25 @@ if (req->createUser) strcat(r, "\n"); sprintf(str, "\n", req->login.const_data().c_str()); strcat(r, str); -if (!req->credit.res_empty()) +if (!req->credit.empty()) { sprintf(str, "\n", req->credit.const_data()); strcat(r, str); } -if (!req->creditExpire.res_empty()) +if (!req->creditExpire.empty()) { sprintf(str, "\n", req->creditExpire.const_data()); strcat(r, str); } -if (!req->prepaidTraff.res_empty()) +if (!req->prepaidTraff.empty()) { sprintf(str, "\n", req->prepaidTraff.const_data()); strcat(r, str); } -if (!req->cash.res_empty()) +if (!req->cash.empty()) { string msg; Encode12str(msg, req->message); @@ -434,7 +398,7 @@ if (!req->cash.res_empty()) strcat(r, str); } -if (!req->setCash.res_empty()) +if (!req->setCash.empty()) { string msg; Encode12str(msg, req->message); @@ -442,38 +406,38 @@ if (!req->setCash.res_empty()) strcat(r, str); } -if (!req->usrPasswd.res_empty()) +if (!req->usrPasswd.empty()) { sprintf(str, "\n", req->usrPasswd.const_data().c_str()); strcat(r, str); } -if (!req->down.res_empty()) +if (!req->down.empty()) { sprintf(str, "\n", req->down.const_data()); strcat(r, str); } -if (!req->passive.res_empty()) +if (!req->passive.empty()) { sprintf(str, "\n", req->passive.const_data()); strcat(r, str); } -if (!req->disableDetailStat.res_empty()) +if (!req->disableDetailStat.empty()) { sprintf(str, "\n", req->disableDetailStat.const_data()); strcat(r, str); } -if (!req->alwaysOnline.res_empty()) +if (!req->alwaysOnline.empty()) { sprintf(str, "\n", req->alwaysOnline.const_data()); strcat(r, str); } // IP-address of user -if (!req->ips.res_empty()) +if (!req->ips.empty()) { sprintf(str, "\n", req->ips.const_data().c_str()); strcat(r, str); @@ -483,7 +447,7 @@ int uPresent = false; int dPresent = false; for (int i = 0; i < DIR_NUM; i++) { - if (!req->monthUpload[i].res_empty()) + if (!req->monthUpload[i].empty()) { if (!uPresent && !dPresent) { @@ -498,7 +462,7 @@ for (int i = 0; i < DIR_NUM; i++) sprintf(str, "MU%d=\"%s\" ", i, ss.str().c_str()); strcat(r, str); } - if (!req->monthDownload[i].res_empty()) + if (!req->monthDownload[i].empty()) { if (!uPresent && !dPresent) { @@ -512,7 +476,7 @@ for (int i = 0; i < DIR_NUM; i++) sprintf(str, "MD%d=\"%s\" ", i, ss.str().c_str()); strcat(r, str); } - if (!req->sessionUpload[i].res_empty()) + if (!req->sessionUpload[i].empty()) { if (!uPresent && !dPresent) { @@ -527,7 +491,7 @@ for (int i = 0; i < DIR_NUM; i++) sprintf(str, "MU%d=\"%s\" ", i, ss.str().c_str()); strcat(r, str); } - if (!req->sessionDownload[i].res_empty()) + if (!req->sessionDownload[i].empty()) { if (!uPresent && !dPresent) { @@ -549,7 +513,7 @@ if (uPresent || dPresent) //printf("%s\n", r); -if (!req->tariff.res_empty()) +if (!req->tariff.empty()) { switch (req->chgTariff) { @@ -569,60 +533,60 @@ if (!req->tariff.res_empty()) } -if (!req->note.res_empty()) +if (!req->note.empty()) { string note; - Encode12str(note, req->note); + Encode12str(note, req->note.data()); sprintf(str, "", note.c_str()); strcat(r, str); } -if (!req->name.res_empty()) +if (!req->name.empty()) { string name; - Encode12str(name, req->name); + Encode12str(name, req->name.data()); sprintf(str, "", name.c_str()); strcat(r, str); } -if (!req->address.res_empty()) +if (!req->address.empty()) { string address; - Encode12str(address, req->address); + Encode12str(address, req->address.data()); sprintf(str, "
", address.c_str()); strcat(r, str); } -if (!req->email.res_empty()) +if (!req->email.empty()) { string email; - Encode12str(email, req->email); + Encode12str(email, req->email.data()); sprintf(str, "", email.c_str()); strcat(r, str); } -if (!req->phone.res_empty()) +if (!req->phone.empty()) { string phone; - Encode12str(phone, req->phone); + Encode12str(phone, req->phone.data()); sprintf(str, "", phone.c_str()); strcat(r, str); } -if (!req->group.res_empty()) +if (!req->group.empty()) { string group; - Encode12str(group, req->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].res_empty()) + if (!req->userData[i].empty()) { string ud; - Encode12str(ud, req->userData[i]); + Encode12str(ud, req->userData[i].data()); sprintf(str, "", i, ud.c_str()); strcat(r, str); } @@ -638,27 +602,27 @@ bool sd = false; bool mu = false; bool md = false; bool ud = false; -bool a = !req->admLogin.res_empty() - && !req->admPasswd.res_empty() - && !req->server.res_empty() - && !req->port.res_empty() - && !req->login.res_empty(); - -bool 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() - - || !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 +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; @@ -666,7 +630,7 @@ bool b = !req->cash.res_empty() for (int i = 0; i < DIR_NUM; i++) { - if (req->sessionUpload[i].res_empty()) + if (req->sessionUpload[i].empty()) { su = true; break; @@ -675,7 +639,7 @@ for (int i = 0; i < DIR_NUM; i++) for (int i = 0; i < DIR_NUM; i++) { - if (req->sessionDownload[i].res_empty()) + if (req->sessionDownload[i].empty()) { sd = true; break; @@ -684,7 +648,7 @@ for (int i = 0; i < DIR_NUM; i++) for (int i = 0; i < DIR_NUM; i++) { - if (req->monthUpload[i].res_empty()) + if (req->monthUpload[i].empty()) { mu = true; break; @@ -693,7 +657,7 @@ for (int i = 0; i < DIR_NUM; i++) for (int i = 0; i < DIR_NUM; i++) { - if (req->monthDownload[i].res_empty()) + if (req->monthDownload[i].empty()) { md = true; break; @@ -702,7 +666,7 @@ for (int i = 0; i < DIR_NUM; i++) for (int i = 0; i < DIR_NUM; i++) { - if (req->userData[i].res_empty()) + if (req->userData[i].empty()) { ud = true; break; @@ -724,7 +688,7 @@ int CheckParametersSet(REQUEST * req) return CheckParameters(req); } //----------------------------------------------------------------------------- -int mainGet(int argc, char **argv) +bool mainGet(int argc, char **argv) { int c; REQUEST req; @@ -885,12 +849,12 @@ if (missedOptionArg || !CheckParametersGet(&req)) } if (req.authBy) - return ProcessAuthBy(req.server, req.port, req.admLogin, req.admPasswd, req.login, req); + return ProcessAuthBy(req.server.data(), req.port.data(), req.admLogin.data(), req.admPasswd.data(), req.login.data()); else - return ProcessGetUser(req.server, req.port, req.admLogin, req.admPasswd, req.login, req); + return ProcessGetUser(req.server.data(), req.port.data(), req.admLogin.data(), req.admPasswd.data(), req.login.data(), req); } //----------------------------------------------------------------------------- -int mainSet(int argc, char **argv) +bool mainSet(int argc, char **argv) { string str; @@ -904,6 +868,8 @@ 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; @@ -933,7 +899,7 @@ while (1) break; case 'o': //change user password - req.usrPasswd = ParsePassword(optarg); + conf.password = ParsePassword(optarg); break; case 'u': //user @@ -941,31 +907,31 @@ while (1) break; case 'c': //add cash - req.cash = ParseCash(optarg, &req.message); + stat.cashAdd = ParseCash(optarg); break; case 'v': //set cash - req.setCash = ParseCash(optarg, &req.message); + stat.cashSet = ParseCash(optarg); break; case 'r': //credit - req.credit = ParseCredit(optarg); + conf.credit = ParseCredit(optarg); break; case 'E': //credit expire - req.creditExpire = ParseCreditExpire(optarg); + conf.creditExpire = ParseCreditExpire(optarg); break; case 'd': //down - req.down = ParseDownPassive(optarg); + conf.disabled = ParseDownPassive(optarg); break; case 'i': //passive - req.passive = ParseDownPassive(optarg); + conf.passive = ParseDownPassive(optarg); break; case 't': //tariff - req.tariff = ParseTariff(optarg, req.chgTariff); + ParseTariff(optarg, conf.tariffName, conf.nextTariff); break; case 'm': //message @@ -975,7 +941,7 @@ while (1) break; case 'e': //Prepaid Traffic - req.prepaidTraff = ParsePrepaidTraffic(optarg); + stat.freeMb = ParsePrepaidTraffic(optarg); break; case 'n': //Create User @@ -988,69 +954,63 @@ while (1) case 'N': //Note ParseAnyString(optarg, &str, "koi8-ru"); - req.note = str; + conf.note = str; break; case 'A': //nAme ParseAnyString(optarg, &str, "koi8-ru"); - req.name = str; + conf.realName = str; break; case 'D': //aDdress ParseAnyString(optarg, &str, "koi8-ru"); - req.address = str; + conf.address = str; break; case 'L': //emaiL ParseAnyString(optarg, &str, "koi8-ru"); - req.email = str; - //printf("EMAIL=%s\n", optarg); + conf.email = str; break; case 'P': //phone ParseAnyString(optarg, &str); - req.phone = str; + conf.phone = str; break; case 'G': //Group ParseAnyString(optarg, &str, "koi8-ru"); - req.group = str; + conf.group = str; break; case 'I': //IP-address of user ParseAnyString(optarg, &str); - req.ips = str; + conf.ips = StrToIPS(str); break; case 'S': - req.disableDetailStat = ParseDownPassive(optarg); + conf.disabledDetailStat = ParseDownPassive(optarg); break; case 'O': - req.alwaysOnline = ParseDownPassive(optarg); + conf.alwaysOnline = ParseDownPassive(optarg); break; case 500: //U - SetArrayItem(req.sessionUpload, optarg, ParseTraff(argv[optind++])); - //req.sessionUpload[optarg] = ParseTraff(argv[optind++]); + SetArrayItem(stat.sessionUp, optarg, ParseTraff(argv[optind++])); break; case 501: - SetArrayItem(req.sessionDownload, optarg, ParseTraff(argv[optind++])); - //req.sessionDownload[optarg] = ParseTraff(argv[optind++]); + SetArrayItem(stat.sessionDown, optarg, ParseTraff(argv[optind++])); break; case 502: - SetArrayItem(req.monthUpload, optarg, ParseTraff(argv[optind++])); - //req.monthUpload[optarg] = ParseTraff(argv[optind++]); + SetArrayItem(stat.monthUp, optarg, ParseTraff(argv[optind++])); break; case 503: - SetArrayItem(req.monthDownload, optarg, ParseTraff(argv[optind++])); - //req.monthDownload[optarg] = ParseTraff(argv[optind++]); + SetArrayItem(stat.monthDown, optarg, ParseTraff(argv[optind++])); break; case 700: //UserData ParseAnyString(argv[optind++], &str); - SetArrayItem(req.userData, optarg, str); - //req.userData[optarg] = str; + SetArrayItem(conf.userdata, optarg, str); break; case '?': @@ -1086,12 +1046,16 @@ 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); +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) { +Usage(); +exit(0); if (argc <= 2) { UsageConf(); @@ -1106,7 +1070,9 @@ if (strcmp(argv[1], "get") == 0) else if (strcmp(argv[1], "set") == 0) { //printf("set\n"); - return mainSet(argc - 1, argv + 1); + if (mainSet(argc - 1, argv + 1) ) + return 0; + return -1; } else { @@ -1117,3 +1083,110 @@ return UNKNOWN_ERR_CODE; } //----------------------------------------------------------------------------- +namespace +{ + +void Usage() +{ +std::cout << "sgconf is the Stargazer management utility.\n\n" + << "Usage:\n" + << "\tsgconf [options]\n\n" + << "General options:\n" + << "\t-f, --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-v, --version\t\t\t\tshow version information and exit\n\n"; +UsageConnection(); +UsageAdmins(); +UsageTariffs(); +UsageUsers(); +UsageServices(); +UsageCorporations(); +} +//----------------------------------------------------------------------------- +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-c, --connect \tconnection params as a single string in format: :@:\n\n"; +} +//----------------------------------------------------------------------------- +void UsageAdmins() +{ +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" + << "\t\t--login\t\t\t\tshow admin's login\n" + << "\t\t--priv\t\t\t\tshow admin's priviledges\n" + << "\t--get-admin\t\t\t\tget the information about admin\n" + << "\t\t--login \t\t\t\tlogin of the admin to show\n" + << "\t\t--priv\t\t\t\tshow admin's priviledges\n" + << "\t--add-admin\t\t\t\tadd a new admin\n" + << "\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" + << "\t--del-admin\t\t\t\tdelete an existing admin\n" + << "\t\t--login \t\t\tlogin of the admin to delete\n" + << "\t--chg-admin\t\t\t\tchange an existing admin\n" + << "\t\t--login \t\t\tlogin of the admin to change\n" + << "\t\t--priv \t\tnew priviledges\n\n"; +} +//----------------------------------------------------------------------------- +void UsageTariffs() +{ +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" + << "\t--get-tariff\t\t\t\tget the information about tariff\n" + << "\t--add-tariff\t\t\t\tadd a new tariff\n" + << "\t--del-tariff\t\t\t\tdelete an existing tariff\n" + << "\t--chg-tariff\t\t\t\tchange an existing tariff\n" + << "\n\n"; +} +//----------------------------------------------------------------------------- +void UsageUsers() +{ +std::cout << "Users management options:\n" + << "\t--get-users\t\t\t\tget a list of users (subsequent options will define what to show)\n" + << "\t--get-user\t\t\t\tget the information about user\n" + << "\t--add-user\t\t\t\tadd a new user\n" + << "\t--del-user\t\t\t\tdelete an existing user\n" + << "\t--chg-user\t\t\t\tchange an existing user\n" + << "\t--check-user\t\t\t\tcheck credentials is valid\n" + << "\t--send-message\t\t\t\tsend a message to a user\n" + << "\n\n"; +} +//----------------------------------------------------------------------------- +void UsageServices() +{ +std::cout << "Services management options:\n" + << "\t--get-services\t\t\t\tget a list of services (subsequent options will define what to show)\n" + << "\t--get-service\t\t\t\tget the information about service\n" + << "\t--add-service\t\t\t\tadd a new service\n" + << "\t--del-service\t\t\t\tdelete an existing service\n" + << "\t--chg-service\t\t\t\tchange an existing service\n" + << "\n\n"; +} +//----------------------------------------------------------------------------- +void UsageCorporations() +{ +std::cout << "Corporations management options:\n" + << "\t--get-corporations\t\t\tget a list of corporations (subsequent options will define what to show)\n" + << "\t\t--name\t\t\t\tshow corporation's name\n" + << "\t\t--cash\t\t\t\tshow corporation's cash\n" + << "\t--get-corp\t\t\t\tget the information about corporation\n" + << "\t\t--name \t\t\tname of the corporation to show\n" + << "\t\t--cash\t\t\t\tshow corporation's cash\n" + << "\t--add-corp\t\t\t\tadd a new corporation\n" + << "\t\t--name \t\t\tname of the corporation to add\n" + << "\t\t--cash \t\t\tinitial corporation's cash (default: \"0\")\n" + << "\t--del-corp\t\t\t\tdelete an existing corporation\n" + << "\t\t--name \t\t\tname of the corporation to delete\n" + << "\t--chg-corp\t\t\t\tchange an existing corporation\n" + << "\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\n"; +} + +} // namespace anonymous