X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/113c3cef204f3380a266483ec9120f673640c673..92f801286d90e89f800f8768e01da2a0be7cd7e8:/projects/sgconf/main.cpp diff --git a/projects/sgconf/main.cpp b/projects/sgconf/main.cpp index 5d82e9f0..b107ee95 100644 --- a/projects/sgconf/main.cpp +++ b/projects/sgconf/main.cpp @@ -38,40 +38,12 @@ #include #include "stg/common.h" -//#include "stg/netunit.h" +#include "stg/netunit.h" #include "request.h" #include "common_sg.h" #include "sg_error_codes.h" -namespace -{ - -template -struct ARRAY_TYPE; - -template -struct ARRAY_TYPE -{ -typedef T type; -}; - -template -struct ARRAY_TYPE -{ -typedef T type; -}; - -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; -} - -} // namespace anonymous +using namespace std; time_t stgTime; @@ -94,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 @@ -132,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 @@ -347,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); @@ -379,10 +401,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.const_data()); sprintf(str, "", req->login.const_data().c_str(), msg.c_str()); //sprintf(str, "\n", req->login, msg); strcat(r, str); @@ -408,72 +430,72 @@ 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); + Encode12str(msg, req->message.c_str()); sprintf(str, "\n", req->cash.const_data(), msg.c_str()); strcat(r, str); } -if (!req->setCash.res_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); } -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,36 +505,7 @@ int uPresent = false; int dPresent = false; for (int i = 0; i < DIR_NUM; i++) { - if (!req->monthUpload[i].res_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].res_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].res_empty()) + if (!req->u[i].empty()) { if (!uPresent && !dPresent) { @@ -522,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].res_empty()) + if (!req->d[i].empty()) { if (!uPresent && !dPresent) { @@ -537,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); } @@ -549,7 +542,7 @@ if (uPresent || dPresent) //printf("%s\n", r); -if (!req->tariff.res_empty()) +if (!req->tariff.empty()) { switch (req->chgTariff) { @@ -569,60 +562,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.const_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.const_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.const_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.const_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.const_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.const_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->ud[i].empty()) { string ud; - Encode12str(ud, req->userData[i]); + Encode12str(ud, req->ud[i].const_data()); sprintf(str, "", i, ud.c_str()); strcat(r, str); } @@ -633,32 +626,30 @@ 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.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 +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(); + +int 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,43 +657,25 @@ bool b = !req->cash.res_empty() for (int i = 0; i < DIR_NUM; i++) { - if (req->sessionUpload[i].res_empty()) - { - su = true; - break; - } - } - -for (int i = 0; i < DIR_NUM; i++) - { - if (req->sessionDownload[i].res_empty()) - { - sd = true; - break; - } - } - -for (int i = 0; i < DIR_NUM; i++) - { - if (req->monthUpload[i].res_empty()) + if (req->u[i].empty()) { - mu = true; + u = true; break; } } for (int i = 0; i < DIR_NUM; i++) { - if (req->monthDownload[i].res_empty()) + if (req->d[i].empty()) { - md = true; + d = true; break; } } for (int i = 0; i < DIR_NUM; i++) { - if (req->userData[i].res_empty()) + if (req->ud[i].empty()) { ud = true; break; @@ -711,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) @@ -724,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; @@ -819,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 = " "; @@ -833,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: @@ -860,6 +853,7 @@ while (1) case '?': case ':': + //printf ("Unknown option \n"); missedOptionArg = true; break; @@ -885,12 +879,12 @@ if (missedOptionArg || !CheckParametersGet(&req)) } if (req.authBy) - return ProcessAuthBy(req.server, req.port, req.admLogin, req.admPasswd, req.login); + 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, req.port, req.admLogin, req.admPasswd, req.login, 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; @@ -1008,7 +1002,7 @@ while (1) break; case 'P': //phone - ParseAnyString(optarg, &str); + ParseAnyString(optarg, &str, "koi8-ru"); req.phone = str; break; @@ -1031,33 +1025,55 @@ while (1) break; case 500: //U - SetArrayItem(req.sessionUpload, optarg, ParseTraff(argv[optind++])); - //req.sessionUpload[optarg] = ParseTraff(argv[optind++]); - break; case 501: - SetArrayItem(req.sessionDownload, optarg, ParseTraff(argv[optind++])); - //req.sessionDownload[optarg] = ParseTraff(argv[optind++]); - break; case 502: - SetArrayItem(req.monthUpload, optarg, ParseTraff(argv[optind++])); - //req.monthUpload[optarg] = ParseTraff(argv[optind++]); - break; case 503: - SetArrayItem(req.monthDownload, optarg, ParseTraff(argv[optind++])); - //req.monthDownload[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(req.userData, optarg, str); - //req.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; @@ -1087,10 +1103,7 @@ char rstr[rLen]; memset(rstr, 0, rLen); CreateRequestSet(&req, rstr); -if (isMessage) - return ProcessSendMessage(req.server, req.port, req.admLogin, req.admPasswd, rstr); - -return ProcessSetUser(req.server, req.port, req.admLogin, req.admPasswd, 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) @@ -1109,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 {