X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/3df642f3d2537dc5531a8d91c6d85927b34b46c7..237f834a52db0d12c85f70c5e65f48ec1923d00a:/projects/stargazer/plugins/configuration/sgconfig/configproto.cpp?ds=sidebyside diff --git a/projects/stargazer/plugins/configuration/sgconfig/configproto.cpp b/projects/stargazer/plugins/configuration/sgconfig/configproto.cpp index 07c319a0..a5ffcf5b 100644 --- a/projects/stargazer/plugins/configuration/sgconfig/configproto.cpp +++ b/projects/stargazer/plugins/configuration/sgconfig/configproto.cpp @@ -28,10 +28,19 @@ $Author: faust $ */ +#include "configproto.h" -#include +#include "parser.h" +#include "parser_auth_by.h" +#include "parser_user_info.h" -#include "configproto.h" +#include "stg/users.h" +#include "stg/admins.h" +#include "stg/tariffs.h" +#include "stg/logger.h" +#include "stg/common.h" + +#include //----------------------------------------------------------------------------- void ParseXMLStart(void *data, const char *el, const char **attr) @@ -40,7 +49,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); } @@ -48,7 +56,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) @@ -86,65 +93,44 @@ else } } //----------------------------------------------------------------------------- -CONFIGPROTO::CONFIGPROTO() - : answerList(), - requestList(), - adminIP(0), - adminLogin(), +CONFIGPROTO::CONFIGPROTO(PLUGIN_LOGGER & l) + : adminIP(0), port(0), - thrReciveSendConf(), nonstop(true), state(0), currAdmin(NULL), - WriteServLog(GetStgLogger()), + logger(l), listenSocket(-1), - parserGetServInfo(), - parserGetUsers(), - parserGetUser(), - parserChgUser(), - parserAddUser(), - parserDelUser(), - parserCheckUser(), - parserSendMessage(), - parserGetAdmins(), - parserAddAdmin(), - parserDelAdmin(), - parserChgAdmin(), - parserGetTariffs(), - parserAddTariff(), - parserDelTariff(), - parserChgTariff(), admins(NULL), - currParser(NULL), - dataParser(), - xmlParser(), - errorStr() + currParser(NULL) { -dataParser.push_back(&parserGetServInfo); - -dataParser.push_back(&parserGetUsers); -dataParser.push_back(&parserGetUser); -dataParser.push_back(&parserChgUser); -dataParser.push_back(&parserAddUser); -dataParser.push_back(&parserDelUser); -dataParser.push_back(&parserCheckUser); -dataParser.push_back(&parserSendMessage); - -dataParser.push_back(&parserGetTariffs); -dataParser.push_back(&parserAddTariff); -dataParser.push_back(&parserDelTariff); -dataParser.push_back(&parserChgTariff); - -dataParser.push_back(&parserGetAdmins); -dataParser.push_back(&parserChgAdmin); -dataParser.push_back(&parserDelAdmin); -dataParser.push_back(&parserAddAdmin); +dataParser.push_back(new PARSER_GET_SERVER_INFO); + +dataParser.push_back(new PARSER_GET_USERS); +dataParser.push_back(new PARSER_GET_USER); +dataParser.push_back(new PARSER_CHG_USER); +dataParser.push_back(new PARSER_ADD_USER); +dataParser.push_back(new PARSER_DEL_USER); +dataParser.push_back(new PARSER_CHECK_USER); +dataParser.push_back(new PARSER_SEND_MESSAGE); +dataParser.push_back(new PARSER_AUTH_BY); +dataParser.push_back(new PARSER_USER_INFO); + +dataParser.push_back(new PARSER_GET_TARIFFS); +dataParser.push_back(new PARSER_ADD_TARIFF); +dataParser.push_back(new PARSER_DEL_TARIFF); +dataParser.push_back(new PARSER_CHG_TARIFF); + +dataParser.push_back(new PARSER_GET_ADMINS); +dataParser.push_back(new PARSER_CHG_ADMIN); +dataParser.push_back(new PARSER_DEL_ADMIN); +dataParser.push_back(new PARSER_ADD_ADMIN); xmlParser = XML_ParserCreate(NULL); if (!xmlParser) { - WriteServLog("Couldn't allocate memory for parser."); + logger("Couldn't allocate memory for parser."); exit(1); } @@ -152,15 +138,16 @@ if (!xmlParser) //----------------------------------------------------------------------------- CONFIGPROTO::~CONFIGPROTO() { +for (size_t i = 0; i < dataParser.size(); ++i) + delete dataParser[i]; XML_ParserFree(xmlParser); } //----------------------------------------------------------------------------- int CONFIGPROTO::ParseCommand() { -list::iterator n; +std::list::iterator n; int done = 0; char str[9]; -int len; if (requestList.empty()) return 0; @@ -178,16 +165,16 @@ while(nonstop) { strncpy(str, (*n).c_str(), 8); str[8] = 0; - len = strlen(str); + size_t len = strlen(str); ++n; if (n == requestList.end()) done = 1; --n; - if (XML_Parse(xmlParser, (*n).c_str(), len, done) == XML_STATUS_ERROR) + if (XML_Parse(xmlParser, (*n).c_str(), static_cast(len), done) == XML_STATUS_ERROR) { - WriteServLog("Invalid configuration request"); + logger("Invalid configuration request"); printfd(__FILE__, "Parse error at line %d:\n%s\n", XML_GetCurrentLineNumber(xmlParser), XML_ErrorString(XML_GetErrorCode(xmlParser))); @@ -210,51 +197,34 @@ while(nonstop) return 0; } //----------------------------------------------------------------------------- -void CONFIGPROTO::SetPort(uint16_t p) -{ -port = p; -} -//----------------------------------------------------------------------------- void CONFIGPROTO::SetAdmins(ADMINS * a) { admins = a; for (size_t i = 0; i < dataParser.size(); i++) - { dataParser[i]->SetAdmins(a); - } - } //----------------------------------------------------------------------------- void CONFIGPROTO::SetUsers(USERS * u) { for (size_t i = 0; i < dataParser.size(); i++) - { dataParser[i]->SetUsers(u); - } - } //----------------------------------------------------------------------------- void CONFIGPROTO::SetTariffs(TARIFFS * t) { for (size_t i = 0; i < dataParser.size(); i++) - { dataParser[i]->SetTariffs(t); - } } //----------------------------------------------------------------------------- void CONFIGPROTO::SetStore(STORE * s) { for (size_t i = 0; i < dataParser.size(); i++) - { dataParser[i]->SetStore(s); - } } //----------------------------------------------------------------------------- void CONFIGPROTO::SetStgSettings(const SETTINGS * s) { for (size_t i = 0; i < dataParser.size(); i++) - { dataParser[i]->SetStgSettings(s); - } } //-----------------------------------------------------------------------------