Split sgconfig parsers into seaparate files.

[stg.git] / projects / stargazer / plugins / configuration / sgconfig / rsconf.cpp

diff --git a/projects/stargazer/plugins/configuration/sgconfig/rsconf.cpp b/projects/stargazer/plugins/configuration/sgconfig/rsconf.cpp
index 15403e8b79bb8730970b79508128444349ffafa6..f7e6169e44cd694284b27901718ad311706e8958 100644 (file)
--- a/projects/stargazer/plugins/configuration/sgconfig/rsconf.cpp
+++ b/projects/stargazer/plugins/configuration/sgconfig/rsconf.cpp
@@ -385,11 +385,11 @@ if (currAdmin->GetLogin().empty())
     }
 
 BLOWFISH_CTX ctx;
     }
 
 BLOWFISH_CTX ctx;

-EnDecodeInit(currAdmin->GetPassword().c_str(), ADM_PASSWD_LEN, &ctx);
+InitContext(currAdmin->GetPassword().c_str(), ADM_PASSWD_LEN, &ctx);

 
 char login[ADM_LOGIN_LEN + 1];
 for (size_t i = 0; i < ADM_LOGIN_LEN / 8; i++)
 
 char login[ADM_LOGIN_LEN + 1];
 for (size_t i = 0; i < ADM_LOGIN_LEN / 8; i++)

-    DecodeString(login + i * 8, loginS + i * 8, &ctx);
+    DecryptBlock(login + i * 8, loginS + i * 8, &ctx);

 
 if (currAdmin == admins->GetNoAdmin())
     {
 
 if (currAdmin == admins->GetNoAdmin())
     {


@@ -435,7 +435,7 @@ int CONFIGPROTO::RecvData(int sock)
 requestList.clear();
 BLOWFISH_CTX ctx;
 
 requestList.clear();
 BLOWFISH_CTX ctx;
 

-EnDecodeInit(currAdmin->GetPassword().c_str(), ADM_PASSWD_LEN, &ctx);
+InitContext(currAdmin->GetPassword().c_str(), ADM_PASSWD_LEN, &ctx);

 
 while (1)
     {
 
 while (1)
     {


@@ -471,7 +471,7 @@ while (1)
     char buffer[8];
     buffer[7] = 0;
 
     char buffer[8];
     buffer[7] = 0;
 

-    DecodeString(buffer, bufferS, &ctx);
+    DecryptBlock(buffer, bufferS, &ctx);

     requestList.push_back(std::string(buffer, pos));
 
     if (done || memchr(buffer, 0, pos) != NULL)
     requestList.push_back(std::string(buffer, pos));
 
     if (done || memchr(buffer, 0, pos) != NULL)


@@ -480,7 +480,7 @@ while (1)
         if (ParseCommand())
             return SendError(sock, "Bad command");
         else
         if (ParseCommand())
             return SendError(sock, "Bad command");
         else

-            return SendDataAnswer(sock, currParser->GetAnswer());
+            return SendDataAnswer(sock, GetDataAnswer());

         }
     }
 //return 0;
         }
     }
 //return 0;


@@ -492,16 +492,16 @@ if (answer.empty())
     return 0;
 
 BLOWFISH_CTX ctx;
     return 0;
 
 BLOWFISH_CTX ctx;

-EnDecodeInit(adminPassword.c_str(), ADM_PASSWD_LEN, &ctx);
+InitContext(adminPassword.c_str(), ADM_PASSWD_LEN, &ctx);

 
 std::string::size_type pos = 0;
 
 std::string::size_type pos = 0;

-std::string::size_type length = answer.length();
+std::string::size_type length = answer.length() + 1;

 while (pos < length)
     {
     char buffer[1024];
     std::string::size_type chunkLength = std::min(length - pos, sizeof(buffer));
 while (pos < length)
     {
     char buffer[1024];
     std::string::size_type chunkLength = std::min(length - pos, sizeof(buffer));

-    EncodeFullString(buffer, answer.c_str() + pos, chunkLength, ctx);
-    if (send(sock, buffer, chunkLength, 0) < 0)
+    EncryptString(buffer, answer.c_str() + pos, chunkLength, &ctx);
+    if (send(sock, buffer, (chunkLength & ~7) < chunkLength ? chunkLength + 8 : chunkLength, 0) < 0) // Need to send data adjusted to the 8-byte boundary.

         return -1;
     pos += chunkLength;
     }
         return -1;
     pos += chunkLength;
     }