X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/641204dfbdb9fc870cdd2e7f9e3169a44693e7bf..5ec330c9443a3ad42258159e11013c116d9c4978:/projects/sgconf/main.cpp diff --git a/projects/sgconf/main.cpp b/projects/sgconf/main.cpp index d2671be4..2e7a13d0 100644 --- a/projects/sgconf/main.cpp +++ b/projects/sgconf/main.cpp @@ -24,31 +24,61 @@ $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 "request.h" -#include "common.h" -#include "netunit.h" -#include "common_sg.h" -#include "sg_error_codes.h" +#include +#include +#include +#include -using namespace std; +namespace +{ -time_t stgTime; +template +struct ARRAY_TYPE +{ +typedef typename T::value_type type; +}; + +template +struct ARRAY_TYPE +{ +typedef T type; +}; -int ParseReplyGet(void * data, list * ans); -//int ParseReplySet(void * data, list * ans); +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 + +time_t stgTime; struct option long_options_get[] = { {"server", 1, 0, 's'}, //Server @@ -66,37 +96,12 @@ 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 -{"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 +{"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 @@ -108,7 +113,8 @@ struct option long_options_get[] = { {"email", 0, 0, 'L'}, //emaiL {"phone", 0, 0, 'P'}, //phone {"group", 0, 0, 'G'}, //Group -{"ip", 0, 0, 'I'}, //IP-address of user +{"ip", 0, 0, 'I'}, //IP-address of user +{"authorized-by",0, 0, 800}, //always online {0, 0, 0, 0}}; @@ -128,37 +134,12 @@ 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 -{"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 +{"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 @@ -170,38 +151,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)]; - -strcpy(str, c); -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) @@ -251,63 +227,40 @@ 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)) +const char * pos = strchr(str, ':'); +if (pos != NULL) { - 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; + 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; -if (strcmp(s2, "now") == 0) - chgType = TARIFF_NOW; - -if (strcmp(s2, "delayed") == 0) - chgType = TARIFF_DEL; - -if (strcmp(s2, "recalc") == 0) - chgType = TARIFF_REC; +stg_strptime(str, "%Y-%m-%d", &brokenTime); -if (chgType < 0) - { - printf("Incorrect tariff value %s\n", t); - exit(PARAMETER_PARSING_ERR_CODE); - } - -ss = s; -delete[] s; -return ss; +return stg_timegm(&brokenTime); } //----------------------------------------------------------------------------- void ParseAnyString(const char * c, string * msg, const char * enc) @@ -382,10 +335,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); @@ -411,19 +364,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->prepaidTraff.res_empty()) +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.res_empty()) +if (!req->cash.empty()) { string msg; Encode12str(msg, req->message); @@ -431,7 +390,7 @@ if (!req->cash.res_empty()) strcat(r, str); } -if (!req->setCash.res_empty()) +if (!req->setCash.empty()) { string msg; Encode12str(msg, req->message); @@ -439,38 +398,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); @@ -480,7 +439,7 @@ int uPresent = false; int dPresent = false; for (int i = 0; i < DIR_NUM; i++) { - if (!req->u[i].res_empty()) + if (!req->monthUpload[i].empty()) { if (!uPresent && !dPresent) { @@ -490,12 +449,12 @@ for (int i = 0; i < DIR_NUM; i++) } stringstream ss; - ss << req->u[i].const_data(); + ss << req->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->d[i].res_empty()) + if (!req->monthDownload[i].empty()) { if (!uPresent && !dPresent) { @@ -505,7 +464,36 @@ for (int i = 0; i < DIR_NUM; i++) } stringstream ss; - ss << req->d[i].const_data(); + ss << req->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); } @@ -517,7 +505,7 @@ if (uPresent || dPresent) //printf("%s\n", r); -if (!req->tariff.res_empty()) +if (!req->tariff.empty()) { switch (req->chgTariff) { @@ -537,60 +525,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->ud[i].res_empty()) + if (!req->userData[i].empty()) { string ud; - Encode12str(ud, req->ud[i]); + Encode12str(ud, req->userData[i].data()); sprintf(str, "", i, ud.c_str()); strcat(r, str); } @@ -601,30 +589,32 @@ 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() - - || !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 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; @@ -632,25 +622,43 @@ int b = !req->cash.res_empty() for (int i = 0; i < DIR_NUM; i++) { - if (req->u[i].res_empty()) + if (req->sessionUpload[i].empty()) { - u = true; + su = true; break; } } for (int i = 0; i < DIR_NUM; i++) { - if (req->d[i].res_empty()) + if (req->sessionDownload[i].empty()) { - d = true; + sd = true; break; } } for (int i = 0; i < DIR_NUM; i++) { - if (req->ud[i].res_empty()) + 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; @@ -659,7 +667,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 || u || d || ud); +return a && (b || su || sd || mu || md || ud); } //----------------------------------------------------------------------------- int CheckParametersGet(REQUEST * req) @@ -672,14 +680,14 @@ int CheckParametersSet(REQUEST * req) return CheckParameters(req); } //----------------------------------------------------------------------------- -int mainGet(int argc, char **argv) +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:crtmodieNADLPGISO"; +const char * short_options_get = "s:p:a:w:u:crtmodieNADLPGISOE"; int option_index = -1; while (1) @@ -724,6 +732,10 @@ while (1) req.credit = 1; break; + case 'E': //credit expire + req.creditExpire = 1; + break; + case 'd': //down req.down = 1; break; @@ -763,10 +775,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 = " "; @@ -777,50 +789,33 @@ 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: - 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; + SetArrayItem(req.monthDownload, optarg, 1); + //req.monthDownload[optarg] = 1; break; case 700: //UserData - 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] = " "; + SetArrayItem(req.userData, optarg, std::string(" ")); + //req.userData[optarg] = " "; + break; + + case 800: + req.authBy = true; break; case '?': case ':': - //printf ("Unknown option \n"); missedOptionArg = true; break; @@ -845,10 +840,13 @@ if (missedOptionArg || !CheckParametersGet(&req)) exit(PARAMETER_PARSING_ERR_CODE); } -return ProcessGetUser(req.server, req.port, req.admLogin, req.admPasswd, req.login, &req); +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); } //----------------------------------------------------------------------------- -int mainSet(int argc, char **argv) +bool mainSet(int argc, char **argv) { string str; @@ -858,10 +856,12 @@ 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:"; +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; @@ -891,7 +891,7 @@ while (1) break; case 'o': //change user password - req.usrPasswd = ParsePassword(optarg); + conf.password = ParsePassword(optarg); break; case 'u': //user @@ -899,27 +899,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 + 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 @@ -929,7 +933,7 @@ while (1) break; case 'e': //Prepaid Traffic - req.prepaidTraff = ParsePrepaidTraffic(optarg); + stat.freeMb = ParsePrepaidTraffic(optarg); break; case 'n': //Create User @@ -941,99 +945,71 @@ while (1) break; case 'N': //Note - ParseAnyString(optarg, &str); - req.note = str; + ParseAnyString(optarg, &str, "koi8-ru"); + conf.note = str; break; case 'A': //nAme - ParseAnyString(optarg, &str, "koi8-r"); - req.name = str; + ParseAnyString(optarg, &str, "koi8-ru"); + conf.realName = str; break; case 'D': //aDdress - ParseAnyString(optarg, &str); - req.address = str; + ParseAnyString(optarg, &str, "koi8-ru"); + conf.address = str; break; case 'L': //emaiL - ParseAnyString(optarg, &str); - req.email = str; - //printf("EMAIL=%s\n", optarg); + ParseAnyString(optarg, &str, "koi8-ru"); + conf.email = str; break; case 'P': //phone ParseAnyString(optarg, &str); - req.phone = str; + conf.phone = str; break; case 'G': //Group - ParseAnyString(optarg, &str); - req.group = str; + ParseAnyString(optarg, &str, "koi8-ru"); + 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(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: - 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); + SetArrayItem(stat.monthDown, optarg, ParseTraff(argv[optind++])); break; case 700: //UserData - case 701: - case 702: - case 703: - case 704: - case 705: - case 706: - case 707: - case 708: - case 709: - ParseAnyString(optarg, &str); - //printf("UD%d\n", c - 700); - req.ud[c - 700] = str; + ParseAnyString(argv[optind++], &str); + SetArrayItem(conf.userdata, optarg, str); break; case '?': - //printf("Missing option argument\n"); missedOptionArg = true; break; case ':': - //printf("Missing option argument\n"); missedOptionArg = true; break; @@ -1062,8 +1038,10 @@ 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) @@ -1082,7 +1060,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 {