From: Maxim Mamontov Date: Fri, 20 Jun 2014 22:11:48 +0000 (+0300) Subject: Optimized sending answers in sgconfig. X-Git-Url: https://git.stg.codes/stg.git/commitdiff_plain/58c44b8153f2164b07be44e463bf7b92044098bd?ds=sidebyside Optimized sending answers in sgconfig. --- diff --git a/projects/stargazer/plugins/configuration/sgconfig/configproto.cpp b/projects/stargazer/plugins/configuration/sgconfig/configproto.cpp index 421349c7..7f46fab2 100644 --- a/projects/stargazer/plugins/configuration/sgconfig/configproto.cpp +++ b/projects/stargazer/plugins/configuration/sgconfig/configproto.cpp @@ -48,7 +48,6 @@ CONFIGPROTO * cp = static_cast(data); if (cp->currParser) { - cp->currParser->SetAnswerList(&cp->answerList); cp->currParser->SetCurrAdmin(*cp->currAdmin); cp->currParser->ParseStart(data, el, attr); } @@ -56,7 +55,6 @@ else { for (size_t i = 0; i < cp->dataParser.size(); i++) { - cp->dataParser[i]->SetAnswerList(&cp->answerList); cp->dataParser[i]->SetCurrAdmin(*cp->currAdmin); cp->dataParser[i]->Reset(); if (cp->dataParser[i]->ParseStart(data, el, attr) == 0) diff --git a/projects/stargazer/plugins/configuration/sgconfig/configproto.h b/projects/stargazer/plugins/configuration/sgconfig/configproto.h index 2b76c413..623254ac 100644 --- a/projects/stargazer/plugins/configuration/sgconfig/configproto.h +++ b/projects/stargazer/plugins/configuration/sgconfig/configproto.h @@ -84,13 +84,12 @@ private: int RecvLoginS(int sock); int SendLoginSAnswer(int sock, int err); int RecvData(int sock); - int SendDataAnswer(int sock); - void SendError(const char * text); + int SendDataAnswer(int sock, const std::string & answer); + int SendError(int sock, const std::string & text); void WriteLogAccessFailed(uint32_t ip); int ParseCommand(); - std::list answerList; std::list requestList; uint32_t adminIP; std::string adminLogin; diff --git a/projects/stargazer/plugins/configuration/sgconfig/parser.cpp b/projects/stargazer/plugins/configuration/sgconfig/parser.cpp index 2c2f2198..017b78b0 100644 --- a/projects/stargazer/plugins/configuration/sgconfig/parser.cpp +++ b/projects/stargazer/plugins/configuration/sgconfig/parser.cpp @@ -17,12 +17,142 @@ #include "parser.h" #define UNAME_LEN (256) + +namespace +{ + +std::string UserToXML(const USER & user, bool loginInStart, bool showPass, time_t lastTime = 0) +{ +std::string answer; + +if (loginInStart) + answer += ""; +else + answer += ""; + +answer += ""; + +if (user.GetProperty().password.ModificationTime() > lastTime) + { + if (showPass) + answer += ""; + else + answer += ""; + } + +if (user.GetProperty().cash.ModificationTime() > lastTime) + answer += ""; +if (user.GetProperty().freeMb.ModificationTime() > lastTime) + answer += ""; +if (user.GetProperty().credit.ModificationTime() > lastTime) + answer += ""; + +if (user.GetProperty().nextTariff.Get() != "") + { + if (user.GetProperty().tariffName.ModificationTime() > lastTime || + user.GetProperty().nextTariff.ModificationTime() > lastTime) + answer += ""; + } +else + { + if (user.GetProperty().tariffName.ModificationTime() > lastTime) + answer += ""; + } + +if (user.GetProperty().note.ModificationTime() > lastTime) + answer += ""; +if (user.GetProperty().phone.ModificationTime() > lastTime) + answer += ""; +if (user.GetProperty().address.ModificationTime() > lastTime) + answer += "
"; +if (user.GetProperty().email.ModificationTime() > lastTime) + answer += ""; + +std::vector *> userdata; +userdata.push_back(user.GetProperty().userdata0.GetPointer()); +userdata.push_back(user.GetProperty().userdata1.GetPointer()); +userdata.push_back(user.GetProperty().userdata2.GetPointer()); +userdata.push_back(user.GetProperty().userdata3.GetPointer()); +userdata.push_back(user.GetProperty().userdata4.GetPointer()); +userdata.push_back(user.GetProperty().userdata5.GetPointer()); +userdata.push_back(user.GetProperty().userdata6.GetPointer()); +userdata.push_back(user.GetProperty().userdata7.GetPointer()); +userdata.push_back(user.GetProperty().userdata8.GetPointer()); +userdata.push_back(user.GetProperty().userdata9.GetPointer()); + +for (size_t i = 0; i < userdata.size(); i++) + if (userdata[i]->ModificationTime() > lastTime) + answer += "Get()) + "\" />"; + +if (user.GetProperty().realName.ModificationTime() > lastTime) + answer += ""; +if (user.GetProperty().group.ModificationTime() > lastTime) + answer += ""; +if (user.GetConnectedModificationTime() > lastTime) + answer += std::string(""; +if (user.GetProperty().alwaysOnline.ModificationTime() > lastTime) + answer += std::string(""; +if (user.GetCurrIPModificationTime() > lastTime) + answer += ""; +if (user.GetPingTime() > lastTime) + answer += ""; +if (user.GetProperty().ips.ModificationTime() > lastTime) + answer += ""; + +answer += " lastTime) + for (size_t j = 0; j < DIR_NUM; j++) + answer += " MU" + x2str(j) + "=\"" + x2str(upload[j]) + "\""; +if (user.GetProperty().down.ModificationTime() > lastTime) + for (size_t j = 0; j < DIR_NUM; j++) + answer += " MD" + x2str(j) + "=\"" + x2str(download[j]) + "\""; +if (user.GetSessionUploadModificationTime() > lastTime) + for (size_t j = 0; j < DIR_NUM; j++) + answer += " SU" + x2str(j) + "=\"" + x2str(user.GetSessionUpload()[j]) + "\""; +if (user.GetSessionDownloadModificationTime() > lastTime) + for (size_t j = 0; j < DIR_NUM; j++) + answer += " SD" + x2str(j) + "=\"" + x2str(user.GetSessionDownload()[j]) + "\""; +answer += "/>"; + +if (user.GetProperty().disabled.ModificationTime() > lastTime) + answer += std::string(""; +if (user.GetProperty().disabledDetailStat.ModificationTime() > lastTime) + answer += std::string(""; +if (user.GetProperty().passive.ModificationTime() > lastTime) + answer += std::string(""; +if (user.GetProperty().lastCashAdd.ModificationTime() > lastTime) + answer += ""; +if (user.GetProperty().lastCashAddTime.ModificationTime() > lastTime) + answer += ""; +if (user.GetProperty().lastActivityTime.ModificationTime() > lastTime) + answer += ""; +if (user.GetProperty().creditExpire.ModificationTime() > lastTime) + answer += ""; + +if (lastTime == 0) + { + answer += ""; + std::vector list(user.GetAuthorizers()); + for (std::vector::const_iterator it = list.begin(); it != list.end(); ++it) + answer += ""; + answer += ""; + } + +answer += ""; + +return answer; +} + +} // namespace anonymous + //----------------------------------------------------------------------------- // GET SERVER INFO //----------------------------------------------------------------------------- int PARSER_GET_SERVER_INFO::ParseStart(void *, const char *el, const char **) { -answerList->erase(answerList->begin(), answerList->end()); +answer.clear(); if (strcasecmp(el, "GetServerInfo") == 0) { return 0; @@ -42,7 +172,6 @@ return -1; //----------------------------------------------------------------------------- void PARSER_GET_SERVER_INFO::CreateAnswer() { -char s[UNAME_LEN + 128]; char un[UNAME_LEN]; struct utsname utsn; @@ -57,40 +186,20 @@ strcat(un, utsn.machine); strcat(un, " "); strcat(un, utsn.nodename); -//answerList->clear(); -answerList->erase(answerList->begin(), answerList->end()); -answerList->push_back(""); - -sprintf(s, "", SERVER_VERSION); -answerList->push_back(s); +answer.clear(); +answer += ""; +answer += std::string(""; +answer += "Count()) + "\"/>"; +answer += ""; +answer += "Count()) + "\"/>"; +answer += std::string(""; +answer += ""; +answer += "GetDayFee()) + "\"/>"; -sprintf(s, "", static_cast(tariffs->Count())); -answerList->push_back(s); +for (size_t i = 0; i< DIR_NUM; i++) + answer += "GetDirName(i)) + "\"/>"; -sprintf(s, "", 2); -answerList->push_back(s); - -sprintf(s, "", static_cast(users->Count())); -answerList->push_back(s); - -sprintf(s, "", un); -answerList->push_back(s); - -sprintf(s, "", DIR_NUM); -answerList->push_back(s); - -sprintf(s, "", settings->GetDayFee()); -answerList->push_back(s); - -for (int i = 0; i< DIR_NUM; i++) - { - std::string dn2e; - Encode12str(dn2e, settings->GetDirName(i)); - sprintf(s, "", i, dn2e.c_str()); - answerList->push_back(s); - } - -answerList->push_back(""); +answer += ""; } //----------------------------------------------------------------------------- // GET USER @@ -124,176 +233,17 @@ return -1; //----------------------------------------------------------------------------- void PARSER_GET_USER::CreateAnswer() { -std::string s; -std::string enc; - USER_PTR u; -answerList->erase(answerList->begin(), answerList->end()); +answer.clear(); if (users->FindByName(login, &u)) { - answerList->push_back(""); + answer = ""; return; } -s = ""; -answerList->push_back(s); - -s = "GetLogin() + "\"/>"; -answerList->push_back(s); - -if (currAdmin->GetPriv()->userConf || currAdmin->GetPriv()->userPasswd) - s = "GetProperty().password.Get() + "\" />"; -else - s = ""; -answerList->push_back(s); - -strprintf(&s, "", u->GetProperty().cash.Get()); -answerList->push_back(s); - -strprintf(&s, "", u->GetProperty().freeMb.Get()); -answerList->push_back(s); - -strprintf(&s, "", u->GetProperty().credit.Get()); -answerList->push_back(s); - -if (u->GetProperty().nextTariff.Get() != "") - { - strprintf(&s, "", - u->GetProperty().tariffName.Get().c_str(), - u->GetProperty().nextTariff.Get().c_str()); - } -else - { - strprintf(&s, "", - u->GetProperty().tariffName.Get().c_str()); - } - -answerList->push_back(s); - -Encode12str(enc, u->GetProperty().note); -s = ""; -answerList->push_back(s); - -Encode12str(enc, u->GetProperty().phone); -s = ""; -answerList->push_back(s); - -Encode12str(enc, u->GetProperty().address); -s = "
"; -answerList->push_back(s); - -Encode12str(enc, u->GetProperty().email); -s = ""; -answerList->push_back(s); - - -std::vector *> userdata; -userdata.push_back(u->GetProperty().userdata0.GetPointer()); -userdata.push_back(u->GetProperty().userdata1.GetPointer()); -userdata.push_back(u->GetProperty().userdata2.GetPointer()); -userdata.push_back(u->GetProperty().userdata3.GetPointer()); -userdata.push_back(u->GetProperty().userdata4.GetPointer()); -userdata.push_back(u->GetProperty().userdata5.GetPointer()); -userdata.push_back(u->GetProperty().userdata6.GetPointer()); -userdata.push_back(u->GetProperty().userdata7.GetPointer()); -userdata.push_back(u->GetProperty().userdata8.GetPointer()); -userdata.push_back(u->GetProperty().userdata9.GetPointer()); - -std::string tmpI; -for (unsigned i = 0; i < userdata.size(); i++) - { - Encode12str(enc, userdata[i]->Get()); - s = ""; - answerList->push_back(s); - } - -Encode12str(enc, u->GetProperty().realName); -s = ""; -answerList->push_back(s); - -Encode12str(enc, u->GetProperty().group); -s = ""; -answerList->push_back(s); - -strprintf(&s, "", u->GetConnected()); -answerList->push_back(s); - -strprintf(&s, "", u->GetProperty().alwaysOnline.Get()); -answerList->push_back(s); - -strprintf(&s, "", inet_ntostring(u->GetCurrIP()).c_str()); -answerList->push_back(s); - -strprintf(&s, "", u->GetPingTime()); -answerList->push_back(s); - -std::ostringstream sstr; -sstr << u->GetProperty().ips.Get(); -strprintf(&s, "", sstr.str().c_str()); -answerList->push_back(s); - -char * ss; -ss = new char[DIR_NUM*25*4 + 50]; -char st[50]; -sprintf(ss, "GetProperty().down.Get(); -upload = u->GetProperty().up.Get(); - -for (int j = 0; j < DIR_NUM; j++) - { - std::string s; - x2str(upload[j], s); - sprintf(st, " MU%d=\"%s\"", j, s.c_str()); - strcat(ss, st); - - x2str(download[j], s); - sprintf(st, " MD%d=\"%s\"", j, s.c_str()); - strcat(ss, st); - - sprintf(st, " SU%d=\"0\"", j); - strcat(ss, st); - - sprintf(st, " SD%d=\"0\"", j); - strcat(ss, st); - } -strcat(ss, " />"); -answerList->push_back(ss); -delete[] ss; - -strprintf(&s, "", u->GetProperty().disabled.Get()); -answerList->push_back(s); - -strprintf(&s, "", u->GetProperty().disabledDetailStat.Get()); -answerList->push_back(s); - -strprintf(&s, "", u->GetProperty().passive.Get()); -answerList->push_back(s); - -strprintf(&s, "", u->GetProperty().lastCashAdd.Get()); -answerList->push_back(s); - -strprintf(&s, "", u->GetProperty().lastCashAddTime.Get()); -answerList->push_back(s); - -strprintf(&s, "", u->GetProperty().lastActivityTime.Get()); -answerList->push_back(s); - -strprintf(&s, "", u->GetProperty().creditExpire.Get()); -answerList->push_back(s); - -s = ""; -std::vector list(u->GetAuthorizers()); -for (std::vector::const_iterator it = list.begin(); it != list.end(); ++it) - s += ""; -s += ""; -answerList->push_back(s); - -strprintf(&s, ""); -answerList->push_back(s); +answer = UserToXML(*u, false, currAdmin->GetPriv()->userConf || currAdmin->GetPriv()->userPasswd); } //----------------------------------------------------------------------------- // GET USERS @@ -346,20 +296,7 @@ return -1; //----------------------------------------------------------------------------- void PARSER_GET_USERS::CreateAnswer() { -answerList->erase(answerList->begin(), answerList->end()); - -std::string s; -std::string userStart; -std::string traffStart; -std::string traffMiddle; -std::string traffFinish; -std::string middle; -std::string userFinish; - - -std::string enc; - -USER_PTR u; +answer.clear(); int h = users->OpenSearch(); if (!h) @@ -368,273 +305,20 @@ if (!h) users->CloseSearch(h); return; } -std::string updateTime; -x2str(time(NULL), updateTime); if (lastUpdateFound) - answerList->push_back(""); + answer += ""; else - answerList->push_back(""); - -while (1) - { - if (users->SearchNext(h, &u)) - { - break; - } - userStart = "GetLogin() + "\">"; - middle = ""; - - if (u->GetProperty().password.ModificationTime() > lastUserUpdateTime) - { - if (currAdmin->GetPriv()->userConf || currAdmin->GetPriv()->userPasswd) - s = "GetProperty().password.Get() + "\" />"; - else - s = ""; - middle += s; - } - - - if (u->GetProperty().cash.ModificationTime() > lastUserUpdateTime) - { - strprintf(&s, "", u->GetProperty().cash.Get()); - middle += s; - //printfd(__FILE__, "cash value=\"%f\"\n", u->GetProperty().cash.Get()); - } - - - if (u->GetProperty().freeMb.ModificationTime() > lastUserUpdateTime) - { - strprintf(&s, "", u->GetProperty().freeMb.Get()); - middle += s; - } - - if (u->GetProperty().credit.ModificationTime() > lastUserUpdateTime) - { - strprintf(&s, "", u->GetProperty().credit.Get()); - middle += s; - } - - if (u->GetProperty().nextTariff.Get() != "") - { - if (u->GetProperty().tariffName.ModificationTime() > lastUserUpdateTime - || u->GetProperty().nextTariff.ModificationTime() > lastUserUpdateTime) - { - strprintf(&s, "", - u->GetProperty().tariffName.Get().c_str(), - u->GetProperty().nextTariff.Get().c_str()); - middle += s; - } - } - else - { - if (u->GetProperty().tariffName.ModificationTime() > lastUserUpdateTime) - { - strprintf(&s, "", - u->GetProperty().tariffName.Get().c_str()); - middle += s; - } - } - - if (u->GetProperty().note.ModificationTime() > lastUserUpdateTime) - { - Encode12str(enc, u->GetProperty().note); - strprintf(&s, "", enc.c_str()); - middle += s; - } - - if (u->GetProperty().phone.ModificationTime() > lastUserUpdateTime) - { - Encode12str(enc, u->GetProperty().phone); - strprintf(&s, "", enc.c_str()); - middle += s; - } - - if (u->GetProperty().address.ModificationTime() > lastUserUpdateTime) - { - Encode12str(enc, u->GetProperty().address); - strprintf(&s, "
", enc.c_str()); - middle += s; - } - - if (u->GetProperty().email.ModificationTime() > lastUserUpdateTime) - { - Encode12str(enc, u->GetProperty().email); - strprintf(&s, "", enc.c_str()); - middle += s; - } - - std::vector *> userdata; - userdata.push_back(u->GetProperty().userdata0.GetPointer()); - userdata.push_back(u->GetProperty().userdata1.GetPointer()); - userdata.push_back(u->GetProperty().userdata2.GetPointer()); - userdata.push_back(u->GetProperty().userdata3.GetPointer()); - userdata.push_back(u->GetProperty().userdata4.GetPointer()); - userdata.push_back(u->GetProperty().userdata5.GetPointer()); - userdata.push_back(u->GetProperty().userdata6.GetPointer()); - userdata.push_back(u->GetProperty().userdata7.GetPointer()); - userdata.push_back(u->GetProperty().userdata8.GetPointer()); - userdata.push_back(u->GetProperty().userdata9.GetPointer()); - - std::string tmpI; - for (unsigned i = 0; i < userdata.size(); i++) - { - if (userdata[i]->ModificationTime() > lastUserUpdateTime) - { - Encode12str(enc, userdata[i]->Get()); - s = ""; - middle += s; - } - } - - if (u->GetProperty().realName.ModificationTime() > lastUserUpdateTime) - { - Encode12str(enc, u->GetProperty().realName); - strprintf(&s, "", enc.c_str()); - middle += s; - } - - if (u->GetProperty().group.ModificationTime() > lastUserUpdateTime) - { - Encode12str(enc, u->GetProperty().group); - strprintf(&s, "", enc.c_str()); - middle += s; - } - - if (u->GetProperty().alwaysOnline.ModificationTime() > lastUserUpdateTime) - { - strprintf(&s, "", u->GetProperty().alwaysOnline.Get()); - middle += s; - } - - if (u->GetCurrIPModificationTime() > lastUserUpdateTime) - { - strprintf(&s, "", inet_ntostring(u->GetCurrIP()).c_str()); - middle += s; - } - - - if (u->GetConnectedModificationTime() > lastUserUpdateTime) - { - strprintf(&s, "", u->GetConnected()); - middle += s; - } - - if (u->GetPingTime() > lastUserUpdateTime) - { - strprintf(&s, "", u->GetPingTime()); - middle += s; - } - - if (u->GetProperty().ips.ModificationTime() > lastUserUpdateTime) - { - std::ostringstream sstr; - sstr << u->GetProperty().ips.Get(); - strprintf(&s, "", sstr.str().c_str()); - middle += s; - } - - char st[50]; - traffStart = "GetProperty().down.Get(); - upload = u->GetProperty().up.Get(); - traffMiddle = ""; - - if (u->GetProperty().up.ModificationTime() > lastUserUpdateTime) - { - for (int j = 0; j < DIR_NUM; j++) - { - std::string s; - x2str(upload[j], s); - sprintf(st, " MU%d=\"%s\" ", j, s.c_str()); - traffMiddle += st; - } - } - - if (u->GetProperty().down.ModificationTime() > lastUserUpdateTime) - { - for (int j = 0; j < DIR_NUM; j++) - { - x2str(download[j], s); - sprintf(st, " MD%d=\"%s\" ", j, s.c_str()); - traffMiddle += st; - } - } - - traffFinish = " />"; - if (traffMiddle.length() > 0) - { - middle += traffStart; - middle += traffMiddle; - middle += traffFinish; - } - - if (u->GetProperty().disabled.ModificationTime() > lastUserUpdateTime) - { - strprintf(&s, "", u->GetProperty().disabled.Get()); - middle += s; - } - - if (u->GetProperty().disabledDetailStat.ModificationTime() > lastUserUpdateTime) - { - strprintf(&s, "", u->GetProperty().disabledDetailStat.Get()); - middle += s; - } - - //printfd(__FILE__, ">>>>> %s\n", s.c_str()); - - if (u->GetProperty().passive.ModificationTime() > lastUserUpdateTime) - { - strprintf(&s, "", u->GetProperty().passive.Get()); - middle += s; - } - - if (u->GetProperty().lastCashAdd.ModificationTime() > lastUserUpdateTime) - { - strprintf(&s, "", u->GetProperty().lastCashAdd.Get()); - middle += s; - } - - if (u->GetProperty().lastCashAddTime.ModificationTime() > lastUserUpdateTime) - { - strprintf(&s, "", u->GetProperty().lastCashAddTime.Get()); - middle += s; - } - - - if (u->GetProperty().lastActivityTime.ModificationTime() > lastUserUpdateTime) - { - strprintf(&s, "", u->GetProperty().lastActivityTime.Get()); - middle += s; - } - - if (u->GetProperty().creditExpire.ModificationTime() > lastUserUpdateTime) - { - strprintf(&s, "", u->GetProperty().creditExpire.Get()); - middle += s; - } + answer += ""; +USER_PTR u; - userFinish = ""; - - if (middle.length() > 0) - { - /*printfd(__FILE__, "login: %s\n", u->GetLogin().c_str()); - printfd(__FILE__, "middle: %s\n", middle.c_str());*/ - - answerList->push_back(userStart); - answerList->push_back(middle); - answerList->push_back(userFinish); - } - } +while (users->SearchNext(h, &u) == 0) + answer += UserToXML(*u, true, currAdmin->GetPriv()->userConf || currAdmin->GetPriv()->userPasswd, lastUserUpdateTime); users->CloseSearch(h); -//answerList->push_back(""); - -answerList->push_back(""); +answer += ""; } //----------------------------------------------------------------------------- // ADD USER @@ -685,17 +369,10 @@ depth = 0; //----------------------------------------------------------------------------- void PARSER_ADD_USER::CreateAnswer() { -//answerList->clear(); -answerList->erase(answerList->begin(), answerList->end()); - if (CheckUserData() == 0) - { - answerList->push_back(""); - } + answer = ""; else - { - answerList->push_back(""); - } + answer = ""; } //----------------------------------------------------------------------------- int PARSER_ADD_USER::CheckUserData() @@ -977,22 +654,19 @@ return -1; //----------------------------------------------------------------------------- void PARSER_CHG_USER::CreateAnswer() { -//answerList->clear(); -answerList->erase(answerList->begin(), answerList->end()); - switch (res) { case 0: - answerList->push_back(""); + answer = ""; break; case -1: - answerList->push_back(""); + answer = ""; break; case -2: - answerList->push_back(""); + answer = ""; break; default: - answerList->push_back(""); + answer = ""; break; } @@ -1339,22 +1013,18 @@ return 0; //----------------------------------------------------------------------------- void PARSER_SEND_MESSAGE::CreateAnswer() { -//answerList->clear(); -answerList->erase(answerList->begin(), answerList->end()); -//answerList->push_back(""); -// switch (result) { case res_ok: - answerList->push_back(""); + answer = ""; break; case res_params_error: printfd(__FILE__, "res_params_error\n"); - answerList->push_back(""); + answer = ""; break; case res_unknown: printfd(__FILE__, "res_unknown\n"); - answerList->push_back(""); + answer = ""; break; default: printfd(__FILE__, "res_default\n"); @@ -1403,9 +1073,9 @@ return -1; void PARSER_DEL_USER::CreateAnswer() { if (res) - answerList->push_back(""); + answer = ""; else - answerList->push_back(""); + answer = ""; } //----------------------------------------------------------------------------- // CHECK USER @@ -1456,9 +1126,9 @@ return -1; void PARSER_CHECK_USER::CreateAnswer(const char * error) { if (error) - answerList->push_back(std::string(""); + answer = std::string(""; else - answerList->push_back(""); + answer = ""; } //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- diff --git a/projects/stargazer/plugins/configuration/sgconfig/parser.h b/projects/stargazer/plugins/configuration/sgconfig/parser.h index 7a71a2a8..b991a807 100644 --- a/projects/stargazer/plugins/configuration/sgconfig/parser.h +++ b/projects/stargazer/plugins/configuration/sgconfig/parser.h @@ -15,7 +15,6 @@ #include "stg/users.h" #include "stg/message.h" -#include #include #include @@ -33,15 +32,12 @@ public: store(NULL), settings(NULL), currAdmin(NULL), - depth(0), - answerList(NULL) + depth(0) {} virtual ~BASE_PARSER() {} virtual int ParseStart(void *data, const char *el, const char **attr) = 0; virtual int ParseEnd(void *data, const char *el) = 0; - virtual void Reset() { answerList->clear(); depth = 0; } - - void SetAnswerList(std::list * ansList) { answerList = ansList; } + virtual void Reset() { answer.clear(); depth = 0; } void SetUsers(USERS * u) { users = u; } void SetAdmins(ADMINS * a) { admins = a; } @@ -50,7 +46,8 @@ public: void SetStgSettings(const SETTINGS * s) { settings = s; } void SetCurrAdmin(ADMIN & cua) { currAdmin = &cua; } - std::string & GetStrError() { return strError; } + const std::string & GetStrError() const { return strError; } + const std::string & GetAnswer() const { return answer; } protected: BASE_PARSER(const BASE_PARSER & rvalue); @@ -64,7 +61,7 @@ protected: const SETTINGS * settings; ADMIN * currAdmin; int depth; - std::list * answerList; + std::string answer; }; //----------------------------------------------------------------------------- class PARSER_GET_ADMINS: public BASE_PARSER { diff --git a/projects/stargazer/plugins/configuration/sgconfig/parser_admin.cpp b/projects/stargazer/plugins/configuration/sgconfig/parser_admin.cpp index d93b3448..7783888e 100644 --- a/projects/stargazer/plugins/configuration/sgconfig/parser_admin.cpp +++ b/projects/stargazer/plugins/configuration/sgconfig/parser_admin.cpp @@ -30,24 +30,18 @@ void PARSER_GET_ADMINS::CreateAnswer() const PRIV * priv = currAdmin->GetPriv(); if (!priv->adminChg) { - //answerList->clear(); - answerList->erase(answerList->begin(), answerList->end()); - - answerList->push_back(""); + answer = ""; return; } -std::string s; -//answerList->clear(); -answerList->erase(answerList->begin(), answerList->end()); +answer.clear(); -answerList->push_back(""); +answer += ""; ADMIN_CONF ac; int h = admins->OpenSearch(); while (admins->SearchNext(h, &ac) == 0) { - //memcpy(&p, &ac.priv, sizeof(unsigned int)); unsigned int p = (ac.priv.userStat << 0) + (ac.priv.userConf << 2) + (ac.priv.userCash << 4) + @@ -55,11 +49,10 @@ while (admins->SearchNext(h, &ac) == 0) (ac.priv.userAddDel << 8) + (ac.priv.adminChg << 10) + (ac.priv.tariffChg << 12); - strprintf(&s, "", ac.login.c_str(), p); - answerList->push_back(s); + answer += ""; } admins->CloseSearch(h); -answerList->push_back(""); +answer += ""; } //----------------------------------------------------------------------------- @@ -89,19 +82,10 @@ return -1; //----------------------------------------------------------------------------- void PARSER_DEL_ADMIN::CreateAnswer() { -//answerList->clear(); -answerList->erase(answerList->begin(), answerList->end()); - if (admins->Del(adminToDel, currAdmin) == 0) - { - answerList->push_back(""); - } + answer = ""; else - { - std::string s; - strprintf(&s, "", admins->GetStrError().c_str()); - answerList->push_back(s); - } + answer = "GetStrError() + "\"/>"; } //----------------------------------------------------------------------------- // ADD ADMIN @@ -118,9 +102,6 @@ return -1; //----------------------------------------------------------------------------- int PARSER_ADD_ADMIN::ParseEnd(void *, const char *el) { -//answerList->clear(); -answerList->erase(answerList->begin(), answerList->end()); - if (strcasecmp(el, "AddAdmin") == 0) { CreateAnswer(); @@ -131,19 +112,10 @@ return -1; //----------------------------------------------------------------------------- void PARSER_ADD_ADMIN::CreateAnswer() { -//answerList->clear(); -answerList->erase(answerList->begin(), answerList->end()); - if (admins->Add(adminToAdd, currAdmin) == 0) - { - answerList->push_back(""); - } + answer = ""; else - { - std::string s; - strprintf(&s, "", admins->GetStrError().c_str()); - answerList->push_back(s); - } + answer = "GetStrError() + "\"/>"; } //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- @@ -195,16 +167,13 @@ return -1; //----------------------------------------------------------------------------- void PARSER_CHG_ADMIN::CreateAnswer() { -answerList->erase(answerList->begin(), answerList->end()); - - if (!login.empty()) { ADMIN * origAdmin = NULL; if (admins->Find(login.data(), &origAdmin)) { - answerList->push_back(std::string(""); + answer = ""; return; } @@ -218,7 +187,7 @@ if (!login.empty()) int p = 0; if (str2x(privAsString.data().c_str(), p) < 0) { - answerList->push_back(""); + answer = ""; return; } @@ -226,20 +195,10 @@ if (!login.empty()) } if (admins->Change(conf, currAdmin) != 0) - { - std::string s; - strprintf(&s, "", admins->GetStrError().c_str()); - answerList->push_back(s); - } + answer = "GetStrError() + "\"/>"; else - { - answerList->push_back(""); - } + answer = ""; } else - { - answerList->push_back(""); - } + answer = ""; } -//-----------------------------------------------------------------------------*/ - diff --git a/projects/stargazer/plugins/configuration/sgconfig/parser_auth_by.cpp b/projects/stargazer/plugins/configuration/sgconfig/parser_auth_by.cpp index 54921571..1ac27d65 100644 --- a/projects/stargazer/plugins/configuration/sgconfig/parser_auth_by.cpp +++ b/projects/stargazer/plugins/configuration/sgconfig/parser_auth_by.cpp @@ -28,19 +28,17 @@ return -1; void PARSER_AUTH_BY::CreateAnswer() { -answerList->erase(answerList->begin(), answerList->end()); - USER_PTR u; if (users->FindByName(login, &u)) { - answerList->push_back(""); + answer = ""; return; } -std::string s = ""; +answer.clear(); +answer += ""; std::vector list(u->GetAuthorizers()); for (std::vector::const_iterator it = list.begin(); it != list.end(); ++it) - s += ""; -s += ""; -answerList->push_back(s); + answer += ""; +answer += ""; } diff --git a/projects/stargazer/plugins/configuration/sgconfig/parser_tariff.cpp b/projects/stargazer/plugins/configuration/sgconfig/parser_tariff.cpp index a4531703..88ab2670 100644 --- a/projects/stargazer/plugins/configuration/sgconfig/parser_tariff.cpp +++ b/projects/stargazer/plugins/configuration/sgconfig/parser_tariff.cpp @@ -29,127 +29,131 @@ return -1; //----------------------------------------------------------------------------- void PARSER_GET_TARIFFS::CreateAnswer() { -std::string s; -char vs[100]; -int hd, hn, md, mn; - -answerList->erase(answerList->begin(), answerList->end()); - -answerList->push_back(""); +answer = ""; std::list dataList; tariffs->GetTariffsData(&dataList); std::list::const_iterator it = dataList.begin(); for (; it != dataList.end(); ++it) { - s = "tariffConf.name + "\">"; - answerList->push_back(s); - - for (int j = 0; j < DIR_NUM; j++) - { - hd = it->dirPrice[j].hDay; - md = it->dirPrice[j].mDay; - - hn = it->dirPrice[j].hNight; - mn = it->dirPrice[j].mNight; + answer += "tariffConf.name + "\">"; - strprintf(&s, "", j, hd, md, hn, mn); - answerList->push_back(s); - } + for (size_t i = 0; i < DIR_NUM; i++) + answer += "dirPrice[i].hDay) + ":" + x2str(it->dirPrice[i].mDay) + "-" + + x2str(it->dirPrice[i].hNight) + ":" + x2str(it->dirPrice[i].mNight) + "\"/>"; - strprintf(&s, " dirPrice[i].priceDayA * pt_mega, i+1 == DIR_NUM?"":"/"); - s += vs; + if (first) + first = false; + else + answer += "/"; + answer += x2str(it->dirPrice[i].priceDayA * pt_mega); } - s += "\"/>"; - answerList->push_back(s); + answer += "\"/>"; - strprintf(&s, " dirPrice[i].priceDayB * pt_mega, i+1 == DIR_NUM?"":"/"); - s += vs; + if (first) + first = false; + else + answer += "/"; + answer += x2str(it->dirPrice[i].priceDayB * pt_mega); } - s += "\"/>"; - answerList->push_back(s); + answer += "\"/>"; - strprintf(&s, " dirPrice[i].priceNightA * pt_mega, i+1 == DIR_NUM?"":"/"); - s += vs; + if (first) + first = false; + else + answer += "/"; + answer += x2str(it->dirPrice[i].priceNightA * pt_mega); } - s += "\"/>"; - answerList->push_back(s); + answer += "\"/>"; - strprintf(&s, " dirPrice[i].priceNightB * pt_mega, i+1 == DIR_NUM?"":"/"); - s += vs; + if (first) + first = false; + else + answer += "/"; + answer += x2str(it->dirPrice[i].priceNightB * pt_mega); } - s += "\"/>"; - answerList->push_back(s); + answer += "\"/>"; - strprintf(&s, " dirPrice[i].threshold, i+1 == DIR_NUM?"":"/"); - s += vs; + if (first) + first = false; + else + answer += "/"; + answer += x2str(it->dirPrice[i].threshold); } - s += "\"/>"; - answerList->push_back(s); + answer += "\"/>"; - strprintf(&s, " dirPrice[i].singlePrice, i+1 == DIR_NUM?"":"/"); - s += vs; + if (first) + first = false; + else + answer += "/"; + answer += (it->dirPrice[i].singlePrice ? "1" : "0"); } - s += "\"/>"; - answerList->push_back(s); + answer += "\"/>"; - strprintf(&s, " dirPrice[i].noDiscount, i+1 == DIR_NUM?"":"/"); - s += vs; + if (first) + first = false; + else + answer += "/"; + answer += (it->dirPrice[i].noDiscount ? "1" : "0"); } - s += "\"/>"; - answerList->push_back(s); + answer += "\"/>"; - strprintf(&s, " ", it->tariffConf.fee); - answerList->push_back(s); + answer += "tariffConf.fee) + "\"/>"; - strprintf(&s, " ", it->tariffConf.passiveCost); - answerList->push_back(s); + answer += "tariffConf.passiveCost) + "\"/>"; - strprintf(&s, " ", it->tariffConf.free); - answerList->push_back(s); + answer += "tariffConf.free) + "\"/>"; switch (it->tariffConf.traffType) { case TRAFF_UP: - answerList->push_back(""); + answer += ""; break; case TRAFF_DOWN: - answerList->push_back(""); + answer += ""; break; case TRAFF_UP_DOWN: - answerList->push_back(""); + answer += ""; break; case TRAFF_MAX: - answerList->push_back(""); + answer += ""; break; } - answerList->push_back("tariffConf.period) + "\"/>"); + answer += "tariffConf.period) + "\"/>"; - answerList->push_back(""); + answer += ""; } -answerList->push_back(""); +answer += ""; } //----------------------------------------------------------------------------- // ADD TARIFF @@ -179,19 +183,10 @@ return -1; //----------------------------------------------------------------------------- void PARSER_ADD_TARIFF::CreateAnswer() { -//answerList->clear(); -answerList->erase(answerList->begin(), answerList->end()); - if (tariffs->Add(tariffToAdd, currAdmin) == 0) - { - answerList->push_back(""); - } + answer = ""; else - { - std::string s; - strprintf(&s, "", tariffs->GetStrError().c_str()); - answerList->push_back(s); - } + answer = "GetStrError() + "\"/>"; } //----------------------------------------------------------------------------- // DEL TARIFF @@ -219,27 +214,12 @@ return -1; //----------------------------------------------------------------------------- void PARSER_DEL_TARIFF::CreateAnswer() { -//answerList->clear(); -answerList->erase(answerList->begin(), answerList->end()); - if (users->TariffInUse(tariffToDel)) - { - std::string s; - strprintf(&s, "", tariffToDel.c_str()); - answerList->push_back(s); - return; - } - -if (tariffs->Del(tariffToDel, currAdmin) == 0) - { - answerList->push_back(""); - } + answer = ""; +else if (tariffs->Del(tariffToDel, currAdmin) == 0) + answer = ""; else - { - std::string s; - strprintf(&s, "", tariffs->GetStrError().c_str()); - answerList->push_back(s); - } + answer = "GetStrError() + "\"/>"; } //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- @@ -481,24 +461,20 @@ return -1; //----------------------------------------------------------------------------- void PARSER_CHG_TARIFF::CreateAnswer() { -answerList->erase(answerList->begin(), answerList->end()); - if (!td.tariffConf.name.data().empty()) { TARIFF_DATA tariffData = td.GetData(); if (tariffs->Chg(tariffData, currAdmin) == 0) { - answerList->push_back(""); + answer = ""; return; } else { - std::string s; - strprintf(&s, "", tariffs->GetStrError().c_str()); - answerList->push_back(s); + answer = "GetStrError() + "\"/>"; return; } } -answerList->push_back(""); +answer = ""; } //----------------------------------------------------------------------------- diff --git a/projects/stargazer/plugins/configuration/sgconfig/parser_user_info.cpp b/projects/stargazer/plugins/configuration/sgconfig/parser_user_info.cpp index 72c3c6ec..0e06a4a7 100644 --- a/projects/stargazer/plugins/configuration/sgconfig/parser_user_info.cpp +++ b/projects/stargazer/plugins/configuration/sgconfig/parser_user_info.cpp @@ -49,22 +49,19 @@ return 0; void PARSER_USER_INFO::CreateAnswer() { -answerList->clear(); - CONST_USER_PTR u; if (users->FindByName(login, &u)) { - answerList->push_back(""); + answer = ""; return; } -std::string s = "GetAuthorizedModificationTime()) + "\"" + - " lastDisconnectTime=\"" + x2str(u->GetConnectedModificationTime()) + "\"" + - " connected=\"" + (u->GetConnected() ? "true" : "false") + "\"" + - " lastDisconnectReason=\"" + u->GetLastDisconnectReason() + "\">"; +answer = "GetAuthorizedModificationTime()) + "\"" + + " lastDisconnectTime=\"" + x2str(u->GetConnectedModificationTime()) + "\"" + + " connected=\"" + (u->GetConnected() ? "true" : "false") + "\"" + + " lastDisconnectReason=\"" + u->GetLastDisconnectReason() + "\">"; std::vector list(u->GetAuthorizers()); for (std::vector::const_iterator it = list.begin(); it != list.end(); ++it) - s += ""; -s += ""; -answerList->push_back(s); + answer += ""; +answer += ""; } diff --git a/projects/stargazer/plugins/configuration/sgconfig/rsconf.cpp b/projects/stargazer/plugins/configuration/sgconfig/rsconf.cpp index 6eb2b424..e9f50e48 100644 --- a/projects/stargazer/plugins/configuration/sgconfig/rsconf.cpp +++ b/projects/stargazer/plugins/configuration/sgconfig/rsconf.cpp @@ -28,7 +28,8 @@ #include "configproto.h" -#include "stg/admins.h" +#include "parser.h" + #include "stg/logger.h" #include "stg/common.h" #include "stg/blowfish.h" @@ -256,7 +257,7 @@ while (pos < stgHdrLen) if (!WaitPackets(sock)) { state = confHdr; - SendError("Bad request"); + SendError(sock, "Bad request"); return -1; } ssize_t ret = recv(sock, &buf[pos], static_cast(stgHdrLen) - static_cast(pos), 0); @@ -277,7 +278,7 @@ if (0 == strncmp(buf, STG_HEADER, strlen(STG_HEADER))) } else { - SendError("Bad request"); + SendError(sock, "Bad request"); } state = confHdr; @@ -484,66 +485,40 @@ while (1) { // End of data if (ParseCommand()) - { - SendError("Bad command"); - } - return SendDataAnswer(sock); + return SendError(sock, "Bad command"); + else + return SendDataAnswer(sock, currParser->GetAnswer()); } } //return 0; } //----------------------------------------------------------------------------- -int CONFIGPROTO::SendDataAnswer(int sock) +int CONFIGPROTO::SendDataAnswer(int sock, const std::string & answer) { -std::list::iterator li; -li = answerList.begin(); +if (answer.empty()) + return 0; BLOWFISH_CTX ctx; - -char buff[8]; -char buffS[8]; -int n = 0; -int k = 0; - EnDecodeInit(adminPassword.c_str(), ADM_PASSWD_LEN, &ctx); -while (li != answerList.end()) +std::string::size_type pos = 0; +std::string::size_type length = answer.length(); +while (pos < length) { - while ((*li).c_str()[k]) - { - buff[n % 8] = (*li).c_str()[k]; - n++; - k++; - - if (n % 8 == 0) - { - EncodeString(buffS, buff, &ctx); - if (send(sock, buffS, 8, 0) < 0) - return -1; - } - } - k = 0;// new node - ++li; + char buffer[1024]; + std::string::size_type chunkLength = std::min(length - pos, sizeof(buffer)); + EncodeFullString(buffer, answer.c_str() + pos, chunkLength, ctx); + if (send(sock, buffer, chunkLength, 0) < 0) + return -1; + pos += chunkLength; } -if (answerList.empty()) { - return 0; -} - -buff[n % 8] = 0; -EncodeString(buffS, buff, &ctx); - -answerList.clear(); - -return static_cast(send(sock, buffS, 8, 0)); +return 1; } //----------------------------------------------------------------------------- -void CONFIGPROTO::SendError(const char * text) +int CONFIGPROTO::SendError(int sock, const std::string & text) { -char s[255]; -answerList.clear(); -snprintf(s, 255, "", text); -answerList.push_back(s); +return SendDataAnswer(sock, ""); } //----------------------------------------------------------------------------- void CONFIGPROTO::WriteLogAccessFailed(uint32_t ip)