Log errors from plugins to server log.

[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 4c26f0d103481524bcc9166c56c8f3f2b57cf036..5b592cbcb8d9221fe75df885c3ed1fac66bf76c8 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>


@@ -74,6 +74,7 @@ listenSocket = socket(PF_INET, SOCK_STREAM, 0);
 if (listenSocket < 0)
     {
     errorStr = "Create NET_CONFIGURATOR socket failed.";
 if (listenSocket < 0)
     {
     errorStr = "Create NET_CONFIGURATOR socket failed.";

+    logger("Cannot create a socket: %s", strerror(errno));

     return -1;
     }
 
     return -1;
     }
 


@@ -86,6 +87,7 @@ int lng = 1;
 if (0 != setsockopt(listenSocket, SOL_SOCKET, SO_REUSEADDR, &lng, 4))
     {
     errorStr = "Setsockopt failed. " + string(strerror(errno));
 if (0 != setsockopt(listenSocket, SOL_SOCKET, SO_REUSEADDR, &lng, 4))
     {
     errorStr = "Setsockopt failed. " + string(strerror(errno));

+    logger("setsockopt error: %s", strerror(errno));

     return -1;
     }
 
     return -1;
     }
 


@@ -94,6 +96,7 @@ res = bind(listenSocket, (struct sockaddr*)&listenAddr, sizeof(listenAddr));
 if (res == -1)
     {
     errorStr = "Bind admin socket failed";
 if (res == -1)
     {
     errorStr = "Bind admin socket failed";

+    logger("Cannot bind the socket: %s", strerror(errno));

     return -1;
     }
 
     return -1;
     }
 


@@ -101,6 +104,7 @@ res = listen(listenSocket, 0);
 if (res == -1)
     {
     errorStr = "Listen admin socket failed";
 if (res == -1)
     {
     errorStr = "Listen admin socket failed";

+    logger("Cannot listen the socket: %s", strerror(errno));

     return -1;
     }
 
     return -1;
     }
 


@@ -129,18 +133,8 @@ close(sock);
 return 0;
 }
 //-----------------------------------------------------------------------------
 return 0;
 }
 //-----------------------------------------------------------------------------

-// æÕÎËÃÉÑ ÏÂÝÅÎÉÑ Ó ËÏÎÆÉÇÕÒÁÔÏÒÏÍ

 void CONFIGPROTO::Run()
 {
 void CONFIGPROTO::Run()
 {

-/*
- * Function Name:ReciveSendConf
- * Parameters: void * a ÕËÁÚÁÔÅÌØ ÎÁ ÜËÚÅÍÐÌÑÒ ËÌÁÓÓÁ CONFIGPROTO
- * Description: üÔÁ ÆÕÎËÃÉÑ ÏÂÅÓÐÅÞÉ×ÁÅÔ ÓÅÔÅ×ÏÅ ×ÚÁÉÍÏÄÅÊÓÔ×ÉÅ
- *  Ó íÅÎÅÄÖÅÒÏÍ ëÌÉÅÎÔÏ×. ÷ ÅÅ ÚÁÄÁÞÉ ×ÈÏÄÉÔ: ÐÒÉÅÍ ÚÁÐÒÏÓÏ× ÐÏ TCP/IP
- *  ÉÈ ÒÁÓÛÉÆÒÏ×ËÁ, ÐÅÒÅÄÁÞÁ ÐÒÉÎÑÔÙÈ ÄÁÎÎÙÈ ÁÎÁÌÉÚÁÔÏÒÕ É ÏÔÐÒÁ×ËÁ ÏÔ×ÅÔÁ ÎÁÚÁÄ.
- * Returns: ×ÏÚ×ÒÁÝÁÅÔ NULL
- */
-

 state = confHdr;
 
 while (nonstop)
 state = confHdr;
 
 while (nonstop)


@@ -154,20 +148,18 @@ while (nonstop)
 
     if (!nonstop)
         {
 
     if (!nonstop)
         {

-        continue;
+        break;

         }
 
         }
 

-    if (outerSocket == -1)
+    if (outerSocket < 0)

         {
         {

+       logger("accept error: %s", strerror(errno));

         printfd(__FILE__, "accept failed\n");
         printfd(__FILE__, "accept failed\n");

-        usleep(100000);

         continue;
         }
 
     adminIP = *(unsigned int*)&(outerAddr.sin_addr);
 
         continue;
         }
 
     adminIP = *(unsigned int*)&(outerAddr.sin_addr);
 

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

     if (state == confHdr)
         {
         if (RecvHdr(outerSocket) < 0)
     if (state == confHdr)
         {
         if (RecvHdr(outerSocket) < 0)


@@ -182,16 +174,14 @@ 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 (state == confLoginCipher)
                 {

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

                     {
                     close(outerSocket);
                     continue;
                     {
                     close(outerSocket);
                     continue;


@@ -201,7 +191,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)


@@ -245,6 +234,7 @@ while (nonstop)
         {
         WriteLogAccessFailed(adminIP);
         }
         {
         WriteLogAccessFailed(adminIP);
         }

+    printfd(__FILE__, "Successfull connection from %s\n", inet_ntostring(outerAddr.sin_addr.s_addr).c_str());

     close(outerSocket);
     }
 }
     close(outerSocket);
     }
 }


@@ -253,16 +243,25 @@ 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;
-int stgHdrLen = strlen(STG_HEADER);
-for (int 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 (!WaitPackets(sock))
+        {
+        state = confHdr;
+        SendError("Bad request");
+        return -1;
+        }
+    int ret = recv(sock, &buf[pos], stgHdrLen - pos, 0);

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

+       if (ret < 0)
+           logger("recv error: %s", strerror(errno));

         state = confHdr;
         return -1;
         }
         state = confHdr;
         return -1;
         }

+    pos += ret;

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


@@ -281,23 +280,19 @@ 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.");
+        logger("send error: %s", strerror(errno));

         return -1;
         }
     }
 else
     {
         return -1;
         }
     }
 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.");
+        logger("send error: %s", strerror(errno));

         return -1;
         }
     }
         return -1;
         }
     }


@@ -307,50 +302,49 @@ return 0;
 //-----------------------------------------------------------------------------
 int CONFIGPROTO::RecvLogin(int sock)
 {
 //-----------------------------------------------------------------------------
 int CONFIGPROTO::RecvLogin(int sock)
 {

-char login[ADM_LOGIN_LEN+1];
-int ret;
+char login[ADM_LOGIN_LEN + 1];

 
 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
-    close(sock);
-    state = confHdr;
-    return ENODATA;
-    }
+    int ret = recv(sock, &login[pos], ADM_LOGIN_LEN - pos, 0);

 
 

-if (ret < ADM_LOGIN_LEN)
-    {
-    // Error in protocol
-    close(sock);
-    state = confHdr;
-    return ENODATA;
-    }
+    if (ret <= 0)
+        {
+        // Error in network
+       logger("recv error: %s", strerror(errno));
+        state = confHdr;
+        return ENODATA;
+        }

 
 

-if (admins->FindAdmin(login, &currAdmin))
+    pos += ret;
+}
+
+if (admins->Find(login, &currAdmin))

     {
     // Admin not found
     {
     // Admin not found

-    close(sock);

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

+

 currAdmin->SetIP(adminIP);
 adminLogin = login;
 state = confLoginCipher;
 return 0;
 }
 //-----------------------------------------------------------------------------
 currAdmin->SetIP(adminIP);
 adminLogin = login;
 state = confLoginCipher;
 return 0;
 }
 //-----------------------------------------------------------------------------

-int CONFIGPROTO::SendLoginAnswer(int sock, int)
+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.");
+    logger("Send OK_LOGIN error in SendLoginAnswer.");

     return -1;
     }
 return 0;
     return -1;
     }
 return 0;


@@ -359,40 +353,44 @@ 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];
-int ret;
-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)

     {
     {

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

 
 

-    if (ret < 0)
+    int ret = recv(sock, &loginS[pos], ADM_LOGIN_LEN - pos, 0);
+
+    if (ret <= 0)

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

-        close(sock);
+       logger("recv error: %s", strerror(errno));

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

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

     }
 
     }
 

-if (currAdmin->GetLogin() == "")
+if (currAdmin->GetLogin().empty())

     {
     state = confHdr;
     return ENODATA;
     }
 
     {
     state = confHdr;
     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);

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


@@ -414,23 +412,19 @@ return 0;
 //-----------------------------------------------------------------------------
 int CONFIGPROTO::SendLoginSAnswer(int sock, int err)
 {
 //-----------------------------------------------------------------------------
 int CONFIGPROTO::SendLoginSAnswer(int sock, int err)
 {

-int ret;
-

 if (err)
     {
 if (err)
     {

-    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.");
+        logger("send error: %s", strerror(errno));

         return -1;
         }
     }
 else
     {
         return -1;
         }
     }
 else
     {

-    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.");
+        logger("send error: %s", strerror(errno));

         return -1;
         }
     }
         return -1;
         }
     }


@@ -439,12 +433,6 @@ return 0;
 //-----------------------------------------------------------------------------
 int CONFIGPROTO::RecvData(int sock)
 {
 //-----------------------------------------------------------------------------
 int CONFIGPROTO::RecvData(int sock)
 {

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

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


@@ -452,36 +440,44 @@ 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))

         {
         {

-        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

-            close(sock);
-            return 0;
+           logger("recv error: %s", strerror(errno));
+            printfd(__FILE__, "recv error: '%s'\n", strerror(errno));
+            return -1;

             }
 
             }
 

-        if (ret < 8)
+        if (ret == 0)

             {
             {

-            if (memchr(buffer, 0, ret) != NULL)
-                {
-                done = true;
-                break;
-                }
+            done = true;
+            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");


@@ -503,7 +499,6 @@ char buff[8];
 char buffS[8];
 int n = 0;
 int k = 0;
 char buffS[8];
 int n = 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);
 


@@ -511,14 +506,14 @@ while (li != answerList.end())
     {
     while ((*li).c_str()[k])
         {
     {
     while ((*li).c_str()[k])
         {

-        buff[n%8] = (*li).c_str()[k];
+        buff[n % 8] = (*li).c_str()[k];

         n++;
         k++;
 
         n++;
         k++;
 

-        if (n%8 == 0)
+        if (n % 8 == 0)

             {
             EncodeString(buffS, buff, &ctx);
             {
             EncodeString(buffS, buff, &ctx);

-            ret = send(sock, buffS, 8, 0);
+            int ret = send(sock, buffS, 8, 0);

             if (ret < 0)
                 {
                 return -1;
             if (ret < 0)
                 {
                 return -1;


@@ -533,7 +528,7 @@ if (answerList.empty()) {
     return 0;
 }
 
     return 0;
 }
 

-buff[n%8] = 0;
+buff[n % 8] = 0;

 EncodeString(buffS, buff, &ctx);
 
 answerList.clear();
 EncodeString(buffS, buff, &ctx);
 
 answerList.clear();


@@ -551,6 +546,6 @@ answerList.push_back(s);
 //-----------------------------------------------------------------------------
 void CONFIGPROTO::WriteLogAccessFailed(uint32_t ip)
 {
 //-----------------------------------------------------------------------------
 void CONFIGPROTO::WriteLogAccessFailed(uint32_t ip)
 {

-WriteServLog("Admin's connect failed. IP %s", inet_ntostring(ip).c_str());
+logger("Admin's connection failed. IP %s", inet_ntostring(ip).c_str());

 }
 //-----------------------------------------------------------------------------
 }
 //-----------------------------------------------------------------------------