Added note about waiting rscriptd until message queue becomes empty

[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 8ceb7e70cc0126591f866a41ff18f3a7eba77fdf..479a135703f24edbdaff610732da870e5393e299 100644 (file)
--- a/projects/stargazer/plugins/configuration/sgconfig/rsconf.cpp
+++ b/projects/stargazer/plugins/configuration/sgconfig/rsconf.cpp
@@ -26,25 +26,19 @@
 *
 *******************************************************************/
 
 *
 *******************************************************************/
 

-/*#include <unistd.h>
-#include <stdio.h>
-#include <netinet/in.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <arpa/inet.h>
-#include <netinet/tcp.h>
-#include <netinet/in.h>
-#include <string.h>
-#include <fcntl.h>
-#include <string.h>
-#include <stdlib.h>
-#include <pthread.h>*/
+#include <unistd.h> // cloase, usleep

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

+#include <cstdio> // snprintf

 
 

+#include "stg/blowfish.h"

 #include "configproto.h"
 #include "configproto.h"

-#include "blowfish.h"
+
+#ifndef ENODATA
+// FreeBSD 4.* - suxx
+#define ENODATA -1
+#endif

 
 enum CONF_STATE
     {
 
 enum CONF_STATE
     {


@@ -109,13 +103,6 @@ if (res == -1)
     errorStr = "Listen admin socket failed";
     return -1;
     }
     errorStr = "Listen admin socket failed";
     return -1;
     }

-outerAddrLen = sizeof(outerAddr);
-
-/*if (0 != fcntl(listenSocket, F_SETFL, O_NONBLOCK))
-    {
-    errorStr = "fcntl error!";
-    return -1;
-    }*/

 
 errorStr = "";
 nonstop = true;
 
 errorStr = "";
 nonstop = true;


@@ -134,7 +121,7 @@ addr.sin_family = PF_INET;
 addr.sin_port = htons(port);
 addr.sin_addr.s_addr = inet_addr("127.0.0.1");
 
 addr.sin_port = htons(port);
 addr.sin_addr.s_addr = inet_addr("127.0.0.1");
 

-addrLen = sizeof(outerAddr);
+addrLen = sizeof(addr);

 sock = socket(PF_INET, SOCK_STREAM, 0);
 connect(sock, (sockaddr*)&addr, addrLen);
 close(sock);
 sock = socket(PF_INET, SOCK_STREAM, 0);
 connect(sock, (sockaddr*)&addr, addrLen);
 close(sock);


@@ -160,86 +147,81 @@ cp->state = confHdr;
 while (cp->nonstop)
     {
     cp->state = confHdr;
 while (cp->nonstop)
     {
     cp->state = confHdr;

-    cp->outerSocket = accept(cp->listenSocket,
-                             (struct sockaddr*)(&cp->outerAddr),
-                             &cp->outerAddrLen);
+    struct sockaddr_in outerAddr;
+    socklen_t outerAddrLen(sizeof(outerAddr));
+    int outerSocket = accept(cp->listenSocket,
+                             (struct sockaddr*)(&outerAddr),
+                             &outerAddrLen);

 
     if (!cp->nonstop)
         {
         continue;
         }
 
 
     if (!cp->nonstop)
         {
         continue;
         }
 

-    if (cp->outerSocket == -1)
+    if (outerSocket == -1)

         {
         printfd(__FILE__, "accept failed\n");
         usleep(100000);
         continue;
         }
 
         {
         printfd(__FILE__, "accept failed\n");
         usleep(100000);
         continue;
         }
 

-    cp->adminIP = *(unsigned int*)&(cp->outerAddr.sin_addr);
-
-    /* TODO
-    if (!cp->hostAllow->HostAllowed(cp->adminIP))
-        {
-        close(outerSocket);
-        continue;
-        }*/
+    cp->adminIP = *(unsigned int*)&(outerAddr.sin_addr);

 
 

-    printfd(__FILE__, "Connection accepted from %s\n", inet_ntostring(cp->outerAddr.sin_addr.s_addr).c_str());
+    printfd(__FILE__, "Connection accepted from %s\n", inet_ntostring(outerAddr.sin_addr.s_addr).c_str());

 
     if (cp->state == confHdr)
         {
 
     if (cp->state == confHdr)
         {

-        if (cp->RecvHdr(cp->outerSocket) < 0)
+        if (cp->RecvHdr(outerSocket) < 0)

             {
             {

-            close(cp->outerSocket);
+            close(outerSocket);

             continue;
             }
         if (cp->state == confLogin)
             {
             continue;
             }
         if (cp->state == confLogin)
             {

-            if (cp->SendHdrAnswer(cp->outerSocket, ans_ok) < 0)
+            if (cp->SendHdrAnswer(outerSocket, ans_ok) < 0)

                 {
                 {

-                close(cp->outerSocket);
+                close(outerSocket);

                 continue;
                 }
 
                 continue;
                 }
 

-            if (cp->RecvLogin(cp->outerSocket) < 0)
+            if (cp->RecvLogin(outerSocket) < 0)

                 {
                 {

-                close(cp->outerSocket);
+                close(outerSocket);

                 continue;
                 }
 
             if (cp->state == confLoginCipher)
                 {
                 continue;
                 }
 
             if (cp->state == confLoginCipher)
                 {

-                if (cp->SendLoginAnswer(cp->outerSocket, ans_ok) < 0)
+                if (cp->SendLoginAnswer(outerSocket, ans_ok) < 0)

                     {
                     {

-                    close(cp->outerSocket);
+                    close(outerSocket);

                     continue;
                     }
                     continue;
                     }

-                if (cp->RecvLoginS(cp->outerSocket) < 0)
+                if (cp->RecvLoginS(outerSocket) < 0)

                     {
                     {

-                    close(cp->outerSocket);
+                    close(outerSocket);

                     continue;
                     }
 
                 if (cp->state == confData)
                     {
                     continue;
                     }
 
                 if (cp->state == confData)
                     {

-                    if (cp->SendLoginSAnswer(cp->outerSocket, ans_ok) < 0)
+                    if (cp->SendLoginSAnswer(outerSocket, ans_ok) < 0)

                         {
                         {

-                        close(cp->outerSocket);
+                        close(outerSocket);

                         continue;
                         }
                         continue;
                         }

-                    if (cp->RecvData(cp->outerSocket) < 0)
+                    if (cp->RecvData(outerSocket) < 0)

                         {
                         {

-                        close(cp->outerSocket);
+                        close(outerSocket);

                         continue;
                         }
                     cp->state = confHdr;
                     }
                 else
                     {
                         continue;
                         }
                     cp->state = confHdr;
                     }
                 else
                     {

-                    if (cp->SendLoginSAnswer(cp->outerSocket, ans_err) < 0)
+                    if (cp->SendLoginSAnswer(outerSocket, ans_err) < 0)

                         {
                         {

-                        close(cp->outerSocket);
+                        close(outerSocket);

                         continue;
                         }
                     cp->WriteLogAccessFailed(cp->adminIP);
                         continue;
                         }
                     cp->WriteLogAccessFailed(cp->adminIP);


@@ -253,9 +235,9 @@ while (cp->nonstop)
         else
             {
             cp->WriteLogAccessFailed(cp->adminIP);
         else
             {
             cp->WriteLogAccessFailed(cp->adminIP);

-            if (cp->SendHdrAnswer(cp->outerSocket, ans_err) < 0)
+            if (cp->SendHdrAnswer(outerSocket, ans_err) < 0)

                 {
                 {

-                close(cp->outerSocket);
+                close(outerSocket);

                 continue;
                 }
             }
                 continue;
                 }
             }


@@ -264,7 +246,7 @@ while (cp->nonstop)
         {
         cp->WriteLogAccessFailed(cp->adminIP);
         }
         {
         cp->WriteLogAccessFailed(cp->adminIP);
         }

-    close(cp->outerSocket);
+    close(outerSocket);

     }
 
 return NULL;
     }
 
 return NULL;


@@ -333,20 +315,6 @@ int ret;
 
 memset(login, 0, ADM_LOGIN_LEN + 1);
 
 
 memset(login, 0, ADM_LOGIN_LEN + 1);
 

-//printfd(__FILE__, "RecvLogin\n");
-
-/*for (int i = 0; i < ADM_LOGIN_LEN; i++)
-    {
-    ret = recv(sock, &login[i], 1, 0);
-
-    if (ret <= 0)
-        {
-        close(sock);
-        state = confHdr;
-        return ENODATA;
-        }
-    }*/
-

 ret = recv(sock, login, ADM_LOGIN_LEN, 0);
 
 if (ret < 0)
 ret = recv(sock, login, ADM_LOGIN_LEN, 0);
 
 if (ret < 0)


@@ -372,7 +340,7 @@ if (admins->FindAdmin(login, &currAdmin))
     state = confHdr;
     return ENODATA;
     }
     state = confHdr;
     return ENODATA;
     }

-currAdmin.SetAdminIP(adminIP);
+currAdmin->SetIP(adminIP);

 adminLogin = login;
 state = confLoginCipher;
 return 0;
 adminLogin = login;
 state = confLoginCipher;
 return 0;


@@ -399,21 +367,6 @@ int ret;
 BLOWFISH_CTX ctx;
 memset(loginS, 0, ADM_LOGIN_LEN + 1);
 
 BLOWFISH_CTX ctx;
 memset(loginS, 0, ADM_LOGIN_LEN + 1);
 

-//printfd(__FILE__, "RecvLoginS\n");
-
-/*for (int i = 0; i < ADM_LOGIN_LEN; i++)
-    {
-    ret = recv(sock, &loginS[i], 1, 0);
-
-    if (ret <= 0)
-        {
-        //printfd(__FILE__, "RecvLoginS close\n");
-        close(sock);
-        state = confHdr;
-        return ENODATA;
-        }
-    }*/
-

 int total = 0;
 
 while (total < ADM_LOGIN_LEN)
 int total = 0;
 
 while (total < ADM_LOGIN_LEN)


@@ -432,23 +385,13 @@ while (total < ADM_LOGIN_LEN)
     total += ret;
     }
 
     total += ret;
     }
 

-// TODO: implement select on socket
-/*if (total < ADM_LOGIN_LEN)
-    {
-    // Protocol error
-    printfd(__FILE__, "Protocol error. Need %d bytes of cryptologin. Got %d bytes.\n", ADM_LOGIN_LEN, ret);
-    close(sock);
-    state = confHdr;
-    return ENODATA;
-    }*/
-
-if (currAdmin.GetLogin() == "")
+if (currAdmin->GetLogin() == "")

     {
     state = confHdr;
     return ENODATA;
     }
 
     {
     state = confHdr;
     return ENODATA;
     }
 

-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++)
     {
 
 for (int i = 0; i < ADM_LOGIN_LEN/8; i++)
     {


@@ -462,7 +405,7 @@ if (currAdmin == admins->GetNoAdmin())
     return 0;
     }
 
     return 0;
     }
 

-if (strncmp(currAdmin.GetLogin().c_str(), login, ADM_LOGIN_LEN) != 0)
+if (strncmp(currAdmin->GetLogin().c_str(), login, ADM_LOGIN_LEN) != 0)

     {
     state = confHdr;
     return ENODATA;
     {
     state = confHdr;
     return ENODATA;


@@ -499,8 +442,6 @@ return 0;
 //-----------------------------------------------------------------------------
 int CONFIGPROTO::RecvData(int sock)
 {
 //-----------------------------------------------------------------------------
 int CONFIGPROTO::RecvData(int sock)
 {

-//printfd(__FILE__, "RecvData\n");
-//int n = 0;

 int ret;
 char bufferS[8];
 char buffer[9];
 int ret;
 char bufferS[8];
 char buffer[9];


@@ -510,17 +451,10 @@ buffer[8] = 0;
 requestList.clear();
 BLOWFISH_CTX ctx;
 
 requestList.clear();
 BLOWFISH_CTX ctx;
 

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

 
 while (1)
     {
 
 while (1)
     {

-    /*ret = recv(sock, &bufferS[n++], 1, 0);
-    if (ret <= 0)
-        {
-        //printfd(__FILE__, "RecvData close\n");
-        close(sock);
-        return 0;
-        }*/

     int total = 0;
     bool done = false;
     while (total < 8)
     int total = 0;
     bool done = false;
     while (total < 8)


@@ -557,25 +491,6 @@ while (1)
             }
         return SendDataAnswer(sock);
         }
             }
         return SendDataAnswer(sock);
         }

-
-    /*if (n == 8)
-        {
-        n = 0;
-        DecodeString(buffer, bufferS, &ctx);
-        requestList.push_back(std::string(buffer, 8));
-        for (int j = 0; j < 8; j++)
-            {
-            if (buffer[j] == 0)
-                {
-                // ëÏÎÅà ÐÏÓÙÌËÉ
-                if (ParseCommand())
-                    {
-                    SendError("Bad command");
-                    }
-                return SendDataAnswer(sock);
-                }
-            }
-        }*/

     }
 return 0;
 }
     }
 return 0;
 }


@@ -593,7 +508,7 @@ int n = 0;
 int k = 0;
 int ret = 0;
 
 int k = 0;
 int ret = 0;
 

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

 
 while (li != answerList.end())
     {
 
 while (li != answerList.end())
     {


@@ -614,7 +529,7 @@ while (li != answerList.end())
             }
         }
     k = 0;// new node
             }
         }
     k = 0;// new node

-    li++;
+    ++li;

     }
 
 if (answerList.empty()) {
     }
 
 if (answerList.empty()) {


@@ -633,7 +548,7 @@ void CONFIGPROTO::SendError(const char * text)
 {
 char s[255];
 answerList.clear();
 {
 char s[255];
 answerList.clear();

-sprintf(s, "<Error value=\"%s\"/>", text);
+snprintf(s, 255, "<Error value=\"%s\"/>", text);

 answerList.push_back(s);
 }
 //-----------------------------------------------------------------------------
 answerList.push_back(s);
 }
 //-----------------------------------------------------------------------------


@@ -642,6 +557,3 @@ void CONFIGPROTO::WriteLogAccessFailed(uint32_t ip)
 WriteServLog("Admin's connect failed. IP %s", inet_ntostring(ip).c_str());
 }
 //-----------------------------------------------------------------------------
 WriteServLog("Admin's connect failed. IP %s", inet_ntostring(ip).c_str());
 }
 //-----------------------------------------------------------------------------

-
-
-