X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/0cfd1e2a9dfa559bf50e3884b556824537e3daf7..0fc9896e27b94093ccde0b8566e2b8109ae8f657:/projects/stargazer/plugins/configuration/sgconfig/configproto.cpp diff --git a/projects/stargazer/plugins/configuration/sgconfig/configproto.cpp b/projects/stargazer/plugins/configuration/sgconfig/configproto.cpp index 23c7d32a..0addee63 100644 --- a/projects/stargazer/plugins/configuration/sgconfig/configproto.cpp +++ b/projects/stargazer/plugins/configuration/sgconfig/configproto.cpp @@ -86,16 +86,39 @@ else } } //----------------------------------------------------------------------------- -CONFIGPROTO::CONFIGPROTO() - : adminIP(0), +CONFIGPROTO::CONFIGPROTO(PLUGIN_LOGGER & l) + : answerList(), + requestList(), + adminIP(0), + adminLogin(), port(0), - nonstop(1), + thrReciveSendConf(), + nonstop(true), state(0), - currAdmin(), - WriteServLog(GetStgLogger()), - listenSocket(0), + currAdmin(NULL), + logger(l), + listenSocket(-1), + parserGetServInfo(), + parserGetUsers(), + parserGetUser(), + parserChgUser(), + parserAddUser(), + parserDelUser(), + parserCheckUser(), + parserSendMessage(), + parserGetAdmins(), + parserAddAdmin(), + parserDelAdmin(), + parserChgAdmin(), + parserGetTariffs(), + parserAddTariff(), + parserDelTariff(), + parserChgTariff(), admins(NULL), - currParser(NULL) + currParser(NULL), + dataParser(), + xmlParser(), + errorStr() { dataParser.push_back(&parserGetServInfo); @@ -121,7 +144,7 @@ xmlParser = XML_ParserCreate(NULL); if (!xmlParser) { - WriteServLog("Couldn't allocate memory for parser."); + logger("Couldn't allocate memory for parser."); exit(1); } @@ -164,7 +187,7 @@ while(nonstop) if (XML_Parse(xmlParser, (*n).c_str(), 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)));