Handle string for encryption properly.

[stg.git] / 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 6c25e099b6390b741f648dc05b3fc1824d667b5f..7bc635ab55407bb3c171b82eeeabf849da8e508c 100644 (file)
--- a/projects/stargazer/plugins/configuration/sgconfig/configproto.cpp
+++ b/projects/stargazer/plugins/configuration/sgconfig/configproto.cpp
@@ -29,6 +29,16 @@
  */
 
 
  */
 
 

+#include "parser.h"
+#include "parser_auth_by.h"
+#include "parser_user_info.h"
+
+#include "stg/users.h"
+#include "stg/admins.h"
+#include "stg/tariffs.h"
+#include "stg/logger.h"
+#include "stg/common.h"
+

 #include <unistd.h>
 
 #include "configproto.h"
 #include <unistd.h>
 
 #include "configproto.h"


@@ -40,15 +50,13 @@ CONFIGPROTO * cp = static_cast<CONFIGPROTO *>(data);
 
 if (cp->currParser)
     {
 
 if (cp->currParser)
     {

-    cp->currParser->SetAnswerList(&cp->answerList);

     cp->currParser->SetCurrAdmin(*cp->currAdmin);
     cp->currParser->ParseStart(data, el, attr);
     }
 else
     {
     cp->currParser->SetCurrAdmin(*cp->currAdmin);
     cp->currParser->ParseStart(data, el, attr);
     }
 else
     {

-    for (unsigned int i = 0; i < cp->dataParser.size(); i++)
+    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)
         cp->dataParser[i]->SetCurrAdmin(*cp->currAdmin);
         cp->dataParser[i]->Reset();
         if (cp->dataParser[i]->ParseStart(data, el, attr) == 0)


@@ -71,57 +79,87 @@ if (cp->currParser)
     {
     if (cp->currParser->ParseEnd(data, el) == 0)
         {
     {
     if (cp->currParser->ParseEnd(data, el) == 0)
         {

+        cp->dataAnswer = cp->currParser->GetAnswer();

         cp->currParser = NULL;
         }
     }
 else
     {
         cp->currParser = NULL;
         }
     }
 else
     {

-    for (unsigned int i = 0; i < cp->dataParser.size(); i++)
+    for (size_t i = 0; i < cp->dataParser.size(); i++)

         {
         if (cp->dataParser[i]->ParseEnd(data, el) == 0)
             {
         {
         if (cp->dataParser[i]->ParseEnd(data, el) == 0)
             {

+            cp->dataAnswer = cp->currParser->GetAnswer();
+            cp->currParser = NULL;

             break;
             }
         }
     }
 }
 //-----------------------------------------------------------------------------
             break;
             }
         }
     }
 }
 //-----------------------------------------------------------------------------

-CONFIGPROTO::CONFIGPROTO()
-    : adminIP(0),
+CONFIGPROTO::CONFIGPROTO(PLUGIN_LOGGER & l)
+    : answerList(),
+      requestList(),
+      adminIP(0),
+      adminLogin(),
+      adminPassword(),

       port(0),
       port(0),

-      nonstop(1),
+      thrReciveSendConf(),
+      nonstop(true),

       state(0),
       state(0),

-      currAdmin(),
-      WriteServLog(GetStgLogger()),
-      listenSocket(0),
+      currAdmin(NULL),
+      logger(l),
+      listenSocket(-1),
+      parserGetServInfo(),
+      parserGetUsers(),
+      parserGetUser(),
+      parserChgUser(),
+      parserAddUser(),
+      parserDelUser(),
+      parserCheckUser(),
+      parserSendMessage(),
+      parserAuthBy(),
+      parserGetAdmins(),
+      parserAddAdmin(),
+      parserDelAdmin(),
+      parserChgAdmin(),
+      parserGetTariffs(),
+      parserAddTariff(),
+      parserDelTariff(),
+      parserChgTariff(),

       admins(NULL),
       admins(NULL),

-      currParser(NULL)
+      currParser(NULL),
+      dataParser(),
+      xmlParser(),
+      errorStr()

 {
 {

-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)
     {
 
 xmlParser = XML_ParserCreate(NULL);
 
 if (!xmlParser)
     {

-    WriteServLog("Couldn't allocate memory for parser.");
+    logger("Couldn't allocate memory for parser.");

     exit(1);
     }
 
     exit(1);
     }
 


@@ -129,15 +167,16 @@ if (!xmlParser)
 //-----------------------------------------------------------------------------
 CONFIGPROTO::~CONFIGPROTO()
 {
 //-----------------------------------------------------------------------------
 CONFIGPROTO::~CONFIGPROTO()
 {

+for (size_t i = 0; i < dataParser.size(); ++i)
+    delete dataParser[i];

 XML_ParserFree(xmlParser);
 }
 //-----------------------------------------------------------------------------
 int CONFIGPROTO::ParseCommand()
 {
 XML_ParserFree(xmlParser);
 }
 //-----------------------------------------------------------------------------
 int CONFIGPROTO::ParseCommand()
 {

-list<string>::iterator n;
+std::list<std::string>::iterator n;

 int done = 0;
 char str[9];
 int done = 0;
 char str[9];

-int len;

 
 if (requestList.empty())
     return 0;
 
 if (requestList.empty())
     return 0;


@@ -155,16 +194,16 @@ while(nonstop)
     {
     strncpy(str, (*n).c_str(), 8);
     str[8] = 0;
     {
     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;
 
 
     ++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<int>(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)));
         printfd(__FILE__, "Parse error at line %d:\n%s\n",
            XML_GetCurrentLineNumber(xmlParser),
            XML_ErrorString(XML_GetErrorCode(xmlParser)));


@@ -195,7 +234,7 @@ port = p;
 void CONFIGPROTO::SetAdmins(ADMINS * a)
 {
 admins = a;
 void CONFIGPROTO::SetAdmins(ADMINS * a)
 {
 admins = a;

-for (unsigned int i = 0; i < dataParser.size(); i++)
+for (size_t i = 0; i < dataParser.size(); i++)

     {
     dataParser[i]->SetAdmins(a);
     }
     {
     dataParser[i]->SetAdmins(a);
     }


@@ -204,7 +243,7 @@ for (unsigned int i = 0; i < dataParser.size(); i++)
 //-----------------------------------------------------------------------------
 void CONFIGPROTO::SetUsers(USERS * u)
 {
 //-----------------------------------------------------------------------------
 void CONFIGPROTO::SetUsers(USERS * u)
 {

-for (unsigned int i = 0; i < dataParser.size(); i++)
+for (size_t i = 0; i < dataParser.size(); i++)

     {
     dataParser[i]->SetUsers(u);
     }
     {
     dataParser[i]->SetUsers(u);
     }


@@ -213,7 +252,7 @@ for (unsigned int i = 0; i < dataParser.size(); i++)
 //-----------------------------------------------------------------------------
 void CONFIGPROTO::SetTariffs(TARIFFS * t)
 {
 //-----------------------------------------------------------------------------
 void CONFIGPROTO::SetTariffs(TARIFFS * t)
 {

-for (unsigned int i = 0; i < dataParser.size(); i++)
+for (size_t i = 0; i < dataParser.size(); i++)

     {
     dataParser[i]->SetTariffs(t);
     }
     {
     dataParser[i]->SetTariffs(t);
     }


@@ -221,7 +260,7 @@ for (unsigned int i = 0; i < dataParser.size(); i++)
 //-----------------------------------------------------------------------------
 void CONFIGPROTO::SetStore(STORE * s)
 {
 //-----------------------------------------------------------------------------
 void CONFIGPROTO::SetStore(STORE * s)
 {

-for (unsigned int i = 0; i < dataParser.size(); i++)
+for (size_t i = 0; i < dataParser.size(); i++)

     {
     dataParser[i]->SetStore(s);
     }
     {
     dataParser[i]->SetStore(s);
     }


@@ -229,19 +268,9 @@ for (unsigned int i = 0; i < dataParser.size(); i++)
 //-----------------------------------------------------------------------------
 void CONFIGPROTO::SetStgSettings(const SETTINGS * s)
 {
 //-----------------------------------------------------------------------------
 void CONFIGPROTO::SetStgSettings(const SETTINGS * s)
 {

-for (unsigned int i = 0; i < dataParser.size(); i++)
+for (size_t i = 0; i < dataParser.size(); i++)

     {
     dataParser[i]->SetStgSettings(s);
     }
 }
 //-----------------------------------------------------------------------------
     {
     dataParser[i]->SetStgSettings(s);
     }
 }
 //-----------------------------------------------------------------------------

-const string & CONFIGPROTO::GetStrError() const
-{
-return errorStr;
-}
-//-----------------------------------------------------------------------------
-uint32_t CONFIGPROTO::GetAdminIP() const
-{
-return adminIP;
-}
-//-----------------------------------------------------------------------------