Merge branch 'naffanya-dev'

[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 0addee63b49e8b03af1d21b0b228ac2f7285f916..015c24602fb5391345a8826ad926cd64293af434 100644 (file)
--- a/projects/stargazer/plugins/configuration/sgconfig/configproto.cpp
+++ b/projects/stargazer/plugins/configuration/sgconfig/configproto.cpp
@@ -91,6 +91,7 @@ CONFIGPROTO::CONFIGPROTO(PLUGIN_LOGGER & l)
       requestList(),
       adminIP(0),
       adminLogin(),
       requestList(),
       adminIP(0),
       adminLogin(),

+      adminPassword(),

       port(0),
       thrReciveSendConf(),
       nonstop(true),
       port(0),
       thrReciveSendConf(),
       nonstop(true),


@@ -106,6 +107,7 @@ CONFIGPROTO::CONFIGPROTO(PLUGIN_LOGGER & l)
       parserDelUser(),
       parserCheckUser(),
       parserSendMessage(),
       parserDelUser(),
       parserCheckUser(),
       parserSendMessage(),

+      parserAuthBy(),

       parserGetAdmins(),
       parserAddAdmin(),
       parserDelAdmin(),
       parserGetAdmins(),
       parserAddAdmin(),
       parserDelAdmin(),


@@ -129,6 +131,7 @@ dataParser.push_back(&parserAddUser);
 dataParser.push_back(&parserDelUser);
 dataParser.push_back(&parserCheckUser);
 dataParser.push_back(&parserSendMessage);
 dataParser.push_back(&parserDelUser);
 dataParser.push_back(&parserCheckUser);
 dataParser.push_back(&parserSendMessage);

+dataParser.push_back(&parserAuthBy);

 
 dataParser.push_back(&parserGetTariffs);
 dataParser.push_back(&parserAddTariff);
 
 dataParser.push_back(&parserGetTariffs);
 dataParser.push_back(&parserAddTariff);


@@ -157,10 +160,9 @@ XML_ParserFree(xmlParser);
 //-----------------------------------------------------------------------------
 int CONFIGPROTO::ParseCommand()
 {
 //-----------------------------------------------------------------------------
 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;


@@ -178,14 +180,14 @@ 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)

         {
         logger("Invalid configuration request");
         printfd(__FILE__, "Parse error at line %d:\n%s\n",
         {
         logger("Invalid configuration request");
         printfd(__FILE__, "Parse error at line %d:\n%s\n",