Minor changes in plugin interface.

[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 23c7d32aba0dec6b9f2b292240f103738d99cbe4..eb8fbcdea81e30eb687eca0a8a2f03b573eca8e7 100644 (file)
--- a/projects/stargazer/plugins/configuration/sgconfig/configproto.cpp
+++ b/projects/stargazer/plugins/configuration/sgconfig/configproto.cpp
@@ -28,10 +28,19 @@
  $Author: faust $
  */
 
  $Author: faust $
  */
 

+#include "configproto.h"

 
 

-#include <unistd.h>
+#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 <unistd.h>

 
 //-----------------------------------------------------------------------------
 void ParseXMLStart(void *data, const char *el, const char **attr)
 
 //-----------------------------------------------------------------------------
 void ParseXMLStart(void *data, const char *el, const char **attr)


@@ -40,25 +49,23 @@ 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);
+    //cp->currParser->SetCurrAdmin(*cp->currAdmin);
+    cp->currParser->Start(data, el, attr);

     }
 else
     {
     for (size_t i = 0; i < cp->dataParser.size(); i++)
         {
     }
 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)
+        //cp->dataParser[i]->SetCurrAdmin(*cp->currAdmin);
+        //cp->dataParser[i]->Reset();
+        if (cp->dataParser[i]->Start(data, el, attr) == 0)

             {
             cp->currParser = cp->dataParser[i];
             break;
             }
         else
             {
             {
             cp->currParser = cp->dataParser[i];
             break;
             }
         else
             {

-            cp->dataParser[i]->Reset();
+            //cp->dataParser[i]->Reset();

             }
         }
     }
             }
         }
     }


@@ -69,8 +76,9 @@ void ParseXMLEnd(void *data, const char *el)
 CONFIGPROTO * cp = static_cast<CONFIGPROTO *>(data);
 if (cp->currParser)
     {
 CONFIGPROTO * cp = static_cast<CONFIGPROTO *>(data);
 if (cp->currParser)
     {

-    if (cp->currParser->ParseEnd(data, el) == 0)
+    if (cp->currParser->End(data, el) == 0)

         {
         {

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

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


@@ -78,50 +86,54 @@ else
     {
     for (size_t 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]->End(data, el) == 0)

             {
             {

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

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

-CONFIGPROTO::CONFIGPROTO()
+CONFIGPROTO::CONFIGPROTO(PLUGIN_LOGGER & l)

     : adminIP(0),
       port(0),
     : adminIP(0),
       port(0),

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

       state(0),
       state(0),

-      currAdmin(),
-      WriteServLog(GetStgLogger()),
-      listenSocket(0),
+      currAdmin(NULL),
+      logger(l),
+      listenSocket(-1),

       admins(NULL),
       currParser(NULL)
 {
       admins(NULL),
       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)
     {
 
 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 +141,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,23 +168,23 @@ 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)));
         if (currParser)
             {
             printfd(__FILE__, "Parser reset\n");
         printfd(__FILE__, "Parse error at line %d:\n%s\n",
            XML_GetCurrentLineNumber(xmlParser),
            XML_ErrorString(XML_GetErrorCode(xmlParser)));
         if (currParser)
             {
             printfd(__FILE__, "Parser reset\n");

-            currParser->Reset();
+            //currParser->Reset();

             currParser = NULL;
             }
 
             currParser = NULL;
             }
 


@@ -187,51 +200,8 @@ while(nonstop)
 return 0;
 }
 //-----------------------------------------------------------------------------
 return 0;
 }
 //-----------------------------------------------------------------------------

-void CONFIGPROTO::SetPort(uint16_t p)
-{
-port = p;
-}
-//-----------------------------------------------------------------------------

 void CONFIGPROTO::SetAdmins(ADMINS * a)
 {
 admins = a;
 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);
-    }

 }
 //-----------------------------------------------------------------------------
 }
 //-----------------------------------------------------------------------------