Version bump

[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 38b423fb8b6b7410faa15faf4e628e1393da20af..07c319a0c9e0cf0849cee2853db291192692bbab 100644 (file)
--- a/projects/stargazer/plugins/configuration/sgconfig/configproto.cpp
+++ b/projects/stargazer/plugins/configuration/sgconfig/configproto.cpp
@@ -41,16 +41,15 @@ CONFIGPROTO * cp = static_cast<CONFIGPROTO *>(data);
 if (cp->currParser)
     {
     cp->currParser->SetAnswerList(&cp->answerList);
 if (cp->currParser)
     {
     cp->currParser->SetAnswerList(&cp->answerList);

-    cp->currParser->SetCurrAdmin(cp->currAdmin);
+    cp->currParser->SetCurrAdmin(*cp->currAdmin);

     cp->currParser->ParseStart(data, el, attr);
     }
 else
     {
     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]->SetAnswerList(&cp->answerList);

-        //cp->currAdmin->SetAdminIP(cp->GetAdminIP());
-        cp->dataParser[i]->SetCurrAdmin(cp->currAdmin);
+        cp->dataParser[i]->SetCurrAdmin(*cp->currAdmin);

         cp->dataParser[i]->Reset();
         if (cp->dataParser[i]->ParseStart(data, el, attr) == 0)
             {
         cp->dataParser[i]->Reset();
         if (cp->dataParser[i]->ParseStart(data, el, attr) == 0)
             {


@@ -77,7 +76,7 @@ if (cp->currParser)
     }
 else
     {
     }
 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)
             {


@@ -88,20 +87,38 @@ else
 }
 //-----------------------------------------------------------------------------
 CONFIGPROTO::CONFIGPROTO()
 }
 //-----------------------------------------------------------------------------
 CONFIGPROTO::CONFIGPROTO()

-    : adminIP(0),
+    : answerList(),
+      requestList(),
+      adminIP(0),
+      adminLogin(),

       port(0),
       port(0),

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

       state(0),
       state(0),

-      currAdmin(),
+      currAdmin(NULL),

       WriteServLog(GetStgLogger()),
       WriteServLog(GetStgLogger()),

-      outerSocket(0),
-      listenSocket(0),
+      listenSocket(-1),
+      parserGetServInfo(),
+      parserGetUsers(),
+      parserGetUser(),
+      parserChgUser(),
+      parserAddUser(),
+      parserDelUser(),
+      parserCheckUser(),
+      parserSendMessage(),
+      parserGetAdmins(),
+      parserAddAdmin(),
+      parserDelAdmin(),
+      parserChgAdmin(),
+      parserGetTariffs(),
+      parserAddTariff(),
+      parserDelTariff(),
+      parserChgTariff(),

       admins(NULL),
       admins(NULL),

-      //users(NULL),
-      //tariffs(NULL),
-      //store(NULL),
-      //settings(NULL),
-      currParser(NULL)
+      currParser(NULL),
+      dataParser(),
+      xmlParser(),
+      errorStr()

 {
 dataParser.push_back(&parserGetServInfo);
 
 {
 dataParser.push_back(&parserGetServInfo);
 


@@ -131,7 +148,6 @@ if (!xmlParser)
     exit(1);
     }
 
     exit(1);
     }
 

-//XML_SetElementHandler(parser, ParseXMLStart, ParseXMLEnd);

 }
 //-----------------------------------------------------------------------------
 CONFIGPROTO::~CONFIGPROTO()
 }
 //-----------------------------------------------------------------------------
 CONFIGPROTO::~CONFIGPROTO()


@@ -164,10 +180,10 @@ while(nonstop)
     str[8] = 0;
     len = strlen(str);
 
     str[8] = 0;
     len = strlen(str);
 

-    n++;
+    ++n;

     if (n == requestList.end())
         done = 1;
     if (n == requestList.end())
         done = 1;

-    n--;
+    --n;

 
     if (XML_Parse(xmlParser, (*n).c_str(), len, done) == XML_STATUS_ERROR)
         {
 
     if (XML_Parse(xmlParser, (*n).c_str(), len, done) == XML_STATUS_ERROR)
         {


@@ -188,7 +204,7 @@ while(nonstop)
     if (done)
         return 0;
 
     if (done)
         return 0;
 

-    n++;
+    ++n;

     }
 
 return 0;
     }
 
 return 0;


@@ -199,15 +215,10 @@ void CONFIGPROTO::SetPort(uint16_t p)
 port = p;
 }
 //-----------------------------------------------------------------------------
 port = p;
 }
 //-----------------------------------------------------------------------------

-/*void CONFIGPROTO::SetHostAllow(HOSTALLOW *)
-{
-//hostAllow = ha;
-}*/
-//-----------------------------------------------------------------------------

 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);
     }


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

-//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);
     }


@@ -226,17 +236,15 @@ for (unsigned int i = 0; i < dataParser.size(); i++)
 //-----------------------------------------------------------------------------
 void CONFIGPROTO::SetTariffs(TARIFFS * t)
 {
 //-----------------------------------------------------------------------------
 void CONFIGPROTO::SetTariffs(TARIFFS * t)
 {

-//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);
     }
 }
 //-----------------------------------------------------------------------------

-void CONFIGPROTO::SetStore(BASE_STORE * s)
+void CONFIGPROTO::SetStore(STORE * s)

 {
 {

-//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);
     }


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

-//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);
     }
 }
 //-----------------------------------------------------------------------------

-/*void CONFIGPROTO::Start()
-{
-finished = false;
-threadExited = false;
-status = starting;
-
-xmlParser = XML_ParserCreate(NULL);
-
-if (!xmlParser)
-    {
-    WriteServLog("Couldn't allocate memory for parser.");
-    }
-
-pthread_create(&thrReciveSendConf, NULL, ReciveSendConf, this);
-status = started;
-}*/
-//-----------------------------------------------------------------------------
-/*int CONFIGPROTO::Stop()
-{
-nonstop = true;
-close(outerSocket);
-return 0;
-}*/
-//-----------------------------------------------------------------------------
-/*void CONFIGPROTO::Restart()
-{
-//Stop();
-//Start();
-}*/
-//-----------------------------------------------------------------------------
-/*CONF_STATUS CONFIGPROTO::Status()
-{
-//return status;
-}
-//-----------------------------------------------------------------------------
-*/
-const string & CONFIGPROTO::GetStrError()
-{
-return errorStr;
-}
-//-----------------------------------------------------------------------------
-uint32_t CONFIGPROTO::GetAdminIP()
-{
-return adminIP;
-}
-//-----------------------------------------------------------------------------