Optimized sending answers in sgconfig.

[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 5b592cbcb8d9221fe75df885c3ed1fac66bf76c8..9488d71d8a28def73abb39cb270108268f33a2fe 100644 (file)
--- a/projects/stargazer/plugins/configuration/sgconfig/rsconf.cpp
+++ b/projects/stargazer/plugins/configuration/sgconfig/rsconf.cpp
@@ -26,14 +26,24 @@
 *
 *******************************************************************/
 
-#include <unistd.h> // close
+#include "configproto.h"
+
+#include "parser.h"
+
+#include "stg/logger.h"
+#include "stg/common.h"
+#include "stg/blowfish.h"
 
 #include <cerrno>
 #include <csignal>
 #include <cstdio> // snprintf
+#include <cstring> // strerror
 
-#include "stg/blowfish.h"
-#include "configproto.h"
+#include <unistd.h> // close
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
 
 #ifndef ENODATA
 // FreeBSD 4.* - suxx
@@ -57,7 +67,6 @@ enum
 //-----------------------------------------------------------------------------
 int CONFIGPROTO::Prepare()
 {
-list<string> ansList; //óÀÄÁ ÂÕÄÅÔ ÐÏÍÅÝÅÎ ÏÔ×ÅÔ ÄÌÑ ÍÅÎÅÄÖÅÒÁ ËÌÉÅÎÔÏ×
 int res;
 struct sockaddr_in listenAddr;
 
@@ -86,7 +95,7 @@ int lng = 1;
 
 if (0 != setsockopt(listenSocket, SOL_SOCKET, SO_REUSEADDR, &lng, 4))
     {
-    errorStr = "Setsockopt failed. " + string(strerror(errno));
+    errorStr = "Setsockopt failed. " + std::string(strerror(errno));
     logger("setsockopt error: %s", strerror(errno));
     return -1;
     }
@@ -250,10 +259,10 @@ while (pos < stgHdrLen)
     if (!WaitPackets(sock))
         {
         state = confHdr;
-        SendError("Bad request");
+        SendError(sock, "Bad request");
         return -1;
         }
-    int ret = recv(sock, &buf[pos], stgHdrLen - pos, 0);
+    ssize_t ret = recv(sock, &buf[pos], static_cast<int>(stgHdrLen) - static_cast<int>(pos), 0);
     if (ret <= 0)
         {
        if (ret < 0)
@@ -271,7 +280,7 @@ if (0 == strncmp(buf, STG_HEADER, strlen(STG_HEADER)))
     }
 else
     {
-    SendError("Bad request");
+    SendError(sock, "Bad request");
     }
 
 state = confHdr;
@@ -314,7 +323,7 @@ while (pos < ADM_LOGIN_LEN) {
         return ENODATA;
         }
 
-    int ret = recv(sock, &login[pos], ADM_LOGIN_LEN - pos, 0);
+    ssize_t ret = recv(sock, &login[pos], ADM_LOGIN_LEN - static_cast<int>(pos), 0);
 
     if (ret <= 0)
         {
@@ -364,7 +373,7 @@ while (pos < ADM_LOGIN_LEN)
         return ENODATA;
         }
 
-    int ret = recv(sock, &loginS[pos], ADM_LOGIN_LEN - pos, 0);
+    ssize_t ret = recv(sock, &loginS[pos], ADM_LOGIN_LEN - static_cast<int>(pos), 0);
 
     if (ret <= 0)
         {
@@ -407,6 +416,7 @@ if (strncmp(currAdmin->GetLogin().c_str(), login, ADM_LOGIN_LEN) != 0)
     }
 
 state = confData;
+adminPassword = currAdmin->GetPassword();
 return 0;
 }
 //-----------------------------------------------------------------------------
@@ -451,7 +461,7 @@ while (1)
             break;
             }
 
-        int ret = recv(sock, &bufferS[pos], sizeof(bufferS) - pos, 0);
+        ssize_t ret = recv(sock, &bufferS[pos], sizeof(bufferS) - static_cast<int>(pos), 0);
         if (ret < 0)
             {
             // Network error
@@ -479,69 +489,40 @@ while (1)
         {
         // End of data
         if (ParseCommand())
-            {
-            SendError("Bad command");
-            }
-        return SendDataAnswer(sock);
+            return SendError(sock, "Bad command");
+        else
+            return SendDataAnswer(sock, currParser->GetAnswer());
         }
     }
-return 0;
+//return 0;
 }
 //-----------------------------------------------------------------------------
-int CONFIGPROTO::SendDataAnswer(int sock)
+int CONFIGPROTO::SendDataAnswer(int sock, const std::string & answer)
 {
-list<string>::iterator li;
-li = answerList.begin();
+if (answer.empty())
+    return 0;
 
 BLOWFISH_CTX ctx;
+EnDecodeInit(adminPassword.c_str(), ADM_PASSWD_LEN, &ctx);
 
-char buff[8];
-char buffS[8];
-int n = 0;
-int k = 0;
-
-EnDecodeInit(currAdmin->GetPassword().c_str(), ADM_PASSWD_LEN, &ctx);
-
-while (li != answerList.end())
+std::string::size_type pos = 0;
+std::string::size_type length = answer.length();
+while (pos < length)
     {
-    while ((*li).c_str()[k])
-        {
-        buff[n % 8] = (*li).c_str()[k];
-        n++;
-        k++;
-
-        if (n % 8 == 0)
-            {
-            EncodeString(buffS, buff, &ctx);
-            int ret = send(sock, buffS, 8, 0);
-            if (ret < 0)
-                {
-                return -1;
-                }
-            }
-        }
-    k = 0;// new node
-    ++li;
+    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)
+        return -1;
+    pos += chunkLength;
     }
 
-if (answerList.empty()) {
-    return 0;
-}
-
-buff[n % 8] = 0;
-EncodeString(buffS, buff, &ctx);
-
-answerList.clear();
-
-return send(sock, buffS, 8, 0);
+return 1;
 }
 //-----------------------------------------------------------------------------
-void CONFIGPROTO::SendError(const char * text)
+int CONFIGPROTO::SendError(int sock, const std::string & text)
 {
-char s[255];
-answerList.clear();
-snprintf(s, 255, "<Error value=\"%s\"/>", text);
-answerList.push_back(s);
+return SendDataAnswer(sock, "<Error value=\"" + text + "\"/>");
 }
 //-----------------------------------------------------------------------------
 void CONFIGPROTO::WriteLogAccessFailed(uint32_t ip)