New sensor added: ActiveUsers

[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 5b94444f0aa11df04660e5d0297061b74d82d9e4..07c319a0c9e0cf0849cee2853db291192692bbab 100644 (file)
--- a/projects/stargazer/plugins/configuration/sgconfig/configproto.cpp
+++ b/projects/stargazer/plugins/configuration/sgconfig/configproto.cpp
@@ -41,15 +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->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)
             {


@@ -76,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)
             {


@@ -87,15 +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()),

-      listenSocket(0),
+      listenSocket(-1),
+      parserGetServInfo(),
+      parserGetUsers(),
+      parserGetUser(),
+      parserChgUser(),
+      parserAddUser(),
+      parserDelUser(),
+      parserCheckUser(),
+      parserSendMessage(),
+      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(&parserGetServInfo);
 


@@ -157,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)
         {


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

-    n++;
+    ++n;

     }
 
 return 0;
     }
 
 return 0;


@@ -195,7 +218,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 +227,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,15 +236,15 @@ 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);
     }
 }
 //-----------------------------------------------------------------------------

-void CONFIGPROTO::SetStore(BASE_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 +252,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;
-}
-//-----------------------------------------------------------------------------