Version bump

[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 f494ee404e739aaedc4c293592ebb065bd2a91a0..421fc7bbeb7bb7e625895aacbb1ace302b5ba88c 100644 (file)
--- a/projects/stargazer/plugins/configuration/sgconfig/rsconf.cpp
+++ b/projects/stargazer/plugins/configuration/sgconfig/rsconf.cpp
@@ -26,7 +26,7 @@
 *
 *******************************************************************/
 
 *
 *******************************************************************/
 

-#include <unistd.h> // cloase, usleep
+#include <unistd.h> // close

 
 #include <cerrno>
 #include <csignal>
 
 #include <cerrno>
 #include <csignal>


@@ -171,13 +171,11 @@ while (nonstop)
                 close(outerSocket);
                 continue;
                 }
                 close(outerSocket);
                 continue;
                 }

-

             if (RecvLogin(outerSocket) < 0)
                 {
                 close(outerSocket);
                 continue;
                 }
             if (RecvLogin(outerSocket) < 0)
                 {
                 close(outerSocket);
                 continue;
                 }

-

             if (state == confLoginCipher)
                 {
                 if (SendLoginAnswer(outerSocket) < 0)
             if (state == confLoginCipher)
                 {
                 if (SendLoginAnswer(outerSocket) < 0)


@@ -190,7 +188,6 @@ while (nonstop)
                     close(outerSocket);
                     continue;
                     }
                     close(outerSocket);
                     continue;
                     }

-

                 if (state == confData)
                     {
                     if (SendLoginSAnswer(outerSocket, ans_ok) < 0)
                 if (state == confData)
                     {
                     if (SendLoginSAnswer(outerSocket, ans_ok) < 0)


@@ -242,16 +239,23 @@ int CONFIGPROTO::RecvHdr(int sock)
 {
 char buf[sizeof(STG_HEADER)];
 memset(buf, 0, sizeof(STG_HEADER));
 {
 char buf[sizeof(STG_HEADER)];
 memset(buf, 0, sizeof(STG_HEADER));

-int ret;
-size_t stgHdrLen = sizeof(STG_HEADER);
-for (size_t i = 0; i < stgHdrLen; i++)
+size_t stgHdrLen = sizeof(STG_HEADER) - 1; // Without 0-char
+size_t pos = 0;
+while (pos < stgHdrLen)

     {
     {

-    ret = recv(sock, &buf[i], 1, 0);
-    if (ret <= 0)
+    if (!WaitPackets(sock))

         {
         state = confHdr;
         {
         state = confHdr;

+        SendError("Bad request");

         return -1;
         }
         return -1;
         }

+    int ret = recv(sock, &buf[pos], stgHdrLen - pos, 0);
+    if (ret < 0)
+        {
+        state = confHdr;
+        return -1;
+        }
+    pos += ret;

     }
 
 if (0 == strncmp(buf, STG_HEADER, strlen(STG_HEADER)))
     }
 
 if (0 == strncmp(buf, STG_HEADER, strlen(STG_HEADER)))


@@ -270,12 +274,9 @@ return -1;
 //-----------------------------------------------------------------------------
 int CONFIGPROTO::SendHdrAnswer(int sock, int err)
 {
 //-----------------------------------------------------------------------------
 int CONFIGPROTO::SendHdrAnswer(int sock, int err)
 {

-int ret;
-

 if (err)
     {
 if (err)
     {

-    ret = send(sock, ERR_HEADER, sizeof(ERR_HEADER) - 1, 0);
-    if (ret < 0)
+    if (send(sock, ERR_HEADER, sizeof(ERR_HEADER) - 1, 0) < 0)

         {
         WriteServLog("send ERR_HEADER error in SendHdrAnswer.");
         return -1;
         {
         WriteServLog("send ERR_HEADER error in SendHdrAnswer.");
         return -1;


@@ -283,8 +284,7 @@ if (err)
     }
 else
     {
     }
 else
     {

-    ret = send(sock, OK_HEADER, sizeof(OK_HEADER) - 1, 0);
-    if (ret < 0)
+    if (send(sock, OK_HEADER, sizeof(OK_HEADER) - 1, 0) < 0)

         {
         WriteServLog("send OK_HEADER error in SendHdrAnswer.");
         return -1;
         {
         WriteServLog("send OK_HEADER error in SendHdrAnswer.");
         return -1;


@@ -297,32 +297,36 @@ return 0;
 int CONFIGPROTO::RecvLogin(int sock)
 {
 char login[ADM_LOGIN_LEN + 1];
 int CONFIGPROTO::RecvLogin(int sock)
 {
 char login[ADM_LOGIN_LEN + 1];

-int ret;

 
 memset(login, 0, ADM_LOGIN_LEN + 1);
 
 
 memset(login, 0, ADM_LOGIN_LEN + 1);
 

-ret = recv(sock, login, ADM_LOGIN_LEN, 0);
+size_t pos = 0;
+while (pos < ADM_LOGIN_LEN) {
+    if (!WaitPackets(sock))
+        {
+        state = confHdr;
+        return ENODATA;
+        }

 
 

-if (ret < 0)
-    {
-    // Error in network
-    state = confHdr;
-    return ENODATA;
-    }
+    int ret = recv(sock, &login[pos], ADM_LOGIN_LEN - pos, 0);

 
 

-if (ret < ADM_LOGIN_LEN)
-    {
-    // Error in protocol
-    state = confHdr;
-    return ENODATA;
-    }
+    if (ret < 0)
+        {
+        // Error in network
+        state = confHdr;
+        return ENODATA;
+        }
+
+    pos += ret;
+}

 
 

-if (admins->FindAdmin(login, &currAdmin))
+if (admins->Find(login, &currAdmin))

     {
     // Admin not found
     state = confHdr;
     return ENODATA;
     }
     {
     // Admin not found
     state = confHdr;
     return ENODATA;
     }

+

 currAdmin->SetIP(adminIP);
 adminLogin = login;
 state = confLoginCipher;
 currAdmin->SetIP(adminIP);
 adminLogin = login;
 state = confLoginCipher;


@@ -331,10 +335,7 @@ return 0;
 //-----------------------------------------------------------------------------
 int CONFIGPROTO::SendLoginAnswer(int sock)
 {
 //-----------------------------------------------------------------------------
 int CONFIGPROTO::SendLoginAnswer(int sock)
 {

-int ret;
-
-ret = send(sock, OK_LOGIN, sizeof(OK_LOGIN) - 1, 0);
-if (ret < 0)
+if (send(sock, OK_LOGIN, sizeof(OK_LOGIN) - 1, 0) < 0)

     {
     WriteServLog("Send OK_LOGIN error in SendLoginAnswer.");
     return -1;
     {
     WriteServLog("Send OK_LOGIN error in SendLoginAnswer.");
     return -1;


@@ -345,15 +346,18 @@ return 0;
 int CONFIGPROTO::RecvLoginS(int sock)
 {
 char loginS[ADM_LOGIN_LEN + 1];
 int CONFIGPROTO::RecvLoginS(int sock)
 {
 char loginS[ADM_LOGIN_LEN + 1];

-char login[ADM_LOGIN_LEN + 1];
-BLOWFISH_CTX ctx;

 memset(loginS, 0, ADM_LOGIN_LEN + 1);
 
 memset(loginS, 0, ADM_LOGIN_LEN + 1);
 

-int total = 0;
-
-while (total < ADM_LOGIN_LEN)
+size_t pos = 0;
+while (pos < ADM_LOGIN_LEN)

     {
     {

-    int ret = recv(sock, &loginS[total], ADM_LOGIN_LEN - total, 0);
+    if (!WaitPackets(sock))
+        {
+        state = confHdr;
+        return ENODATA;
+        }
+
+    int ret = recv(sock, &loginS[pos], ADM_LOGIN_LEN - pos, 0);

 
     if (ret < 0)
         {
 
     if (ret < 0)
         {


@@ -363,7 +367,7 @@ while (total < ADM_LOGIN_LEN)
         return ENODATA;
         }
 
         return ENODATA;
         }
 

-    total += ret;
+    pos += ret;

     }
 
 if (currAdmin->GetLogin().empty())
     }
 
 if (currAdmin->GetLogin().empty())


@@ -372,9 +376,11 @@ if (currAdmin->GetLogin().empty())
     return ENODATA;
     }
 
     return ENODATA;
     }
 

+BLOWFISH_CTX ctx;

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

-for (int 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);
     }
     {
     DecodeString(login + i * 8, loginS + i * 8, &ctx);
     }


@@ -400,8 +406,7 @@ int CONFIGPROTO::SendLoginSAnswer(int sock, int err)
 {
 if (err)
     {
 {
 if (err)
     {

-    int ret = send(sock, ERR_LOGINS, sizeof(ERR_LOGINS) - 1, 0);
-    if (ret < 0)
+    if (send(sock, ERR_LOGINS, sizeof(ERR_LOGINS) - 1, 0) < 0)

         {
         WriteServLog("send ERR_LOGIN error in SendLoginAnswer.");
         return -1;
         {
         WriteServLog("send ERR_LOGIN error in SendLoginAnswer.");
         return -1;


@@ -409,8 +414,7 @@ if (err)
     }
 else
     {
     }
 else
     {

-    int ret = send(sock, OK_LOGINS, sizeof(OK_LOGINS) - 1, 0);
-    if (ret < 0)
+    if (send(sock, OK_LOGINS, sizeof(OK_LOGINS) - 1, 0) < 0)

         {
         WriteServLog("send OK_LOGINS error in SendLoginSAnswer.");
         return -1;
         {
         WriteServLog("send OK_LOGINS error in SendLoginSAnswer.");
         return -1;


@@ -421,11 +425,6 @@ return 0;
 //-----------------------------------------------------------------------------
 int CONFIGPROTO::RecvData(int sock)
 {
 //-----------------------------------------------------------------------------
 int CONFIGPROTO::RecvData(int sock)
 {

-char bufferS[8];
-char buffer[9];
-
-buffer[8] = 0;
-

 requestList.clear();
 BLOWFISH_CTX ctx;
 
 requestList.clear();
 BLOWFISH_CTX ctx;
 


@@ -433,14 +432,22 @@ EnDecodeInit(currAdmin->GetPassword().c_str(), ADM_PASSWD_LEN, &ctx);
 
 while (1)
     {
 
 while (1)
     {

-    int total = 0;

     bool done = false;
     bool done = false;

-    while (total < 8)
+    char bufferS[8];
+    size_t pos = 0;
+    while (pos < sizeof(bufferS))

         {
         {

-        int ret = recv(sock, &bufferS[total], 8 - total, 0);
+        if (!WaitPackets(sock))
+            {
+            done = true;
+            break;
+            }
+
+        int ret = recv(sock, &bufferS[pos], sizeof(bufferS) - pos, 0);

         if (ret < 0)
             {
             // Network error
         if (ret < 0)
             {
             // Network error

+            printfd(__FILE__, "recv error: '%s'\n", strerror(errno));

             return -1;
             }
 
             return -1;
             }
 


@@ -450,15 +457,18 @@ while (1)
             break;
             }
 
             break;
             }
 

-        total += ret;
+        pos += ret;

         }
 
         }
 

+    char buffer[8];
+    buffer[7] = 0;
+

     DecodeString(buffer, bufferS, &ctx);
     DecodeString(buffer, bufferS, &ctx);

-    requestList.push_back(std::string(buffer, total));
+    requestList.push_back(std::string(buffer, pos));

 
 

-    if (done || memchr(buffer, 0, total) != NULL)
+    if (done || memchr(buffer, 0, pos) != NULL)

         {
         {

-        // ëÏÎÅà ÐÏÓÙÌËÉ
+        // End of data

         if (ParseCommand())
             {
             SendError("Bad command");
         if (ParseCommand())
             {
             SendError("Bad command");