Introduced logger for plugins.

[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 9ec72a1c1aa67f628c45e7af0dc72d9f1de23f37..5e69984894c846b801d88babcd2698cbda7693cb 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>
@@ -250,7 +250,7 @@ while (pos < stgHdrLen)
         return -1;
         }
     int ret = recv(sock, &buf[pos], stgHdrLen - pos, 0);
-    if (ret < 0)
+    if (ret <= 0)
         {
         state = confHdr;
         return -1;
@@ -278,7 +278,7 @@ if (err)
     {
     if (send(sock, ERR_HEADER, sizeof(ERR_HEADER) - 1, 0) < 0)
         {
-        WriteServLog("send ERR_HEADER error in SendHdrAnswer.");
+        logger("send ERR_HEADER error in SendHdrAnswer.");
         return -1;
         }
     }
@@ -286,7 +286,7 @@ else
     {
     if (send(sock, OK_HEADER, sizeof(OK_HEADER) - 1, 0) < 0)
         {
-        WriteServLog("send OK_HEADER error in SendHdrAnswer.");
+        logger("send OK_HEADER error in SendHdrAnswer.");
         return -1;
         }
     }
@@ -310,7 +310,7 @@ while (pos < ADM_LOGIN_LEN) {
 
     int ret = recv(sock, &login[pos], ADM_LOGIN_LEN - pos, 0);
 
-    if (ret < 0)
+    if (ret <= 0)
         {
         // Error in network
         state = confHdr;
@@ -337,7 +337,7 @@ int CONFIGPROTO::SendLoginAnswer(int sock)
 {
 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;
@@ -359,7 +359,7 @@ while (pos < ADM_LOGIN_LEN)
 
     int ret = recv(sock, &loginS[pos], ADM_LOGIN_LEN - pos, 0);
 
-    if (ret < 0)
+    if (ret <= 0)
         {
         // Network error
         printfd(__FILE__, "recv error: '%s'\n", strerror(errno));
@@ -408,7 +408,7 @@ if (err)
     {
     if (send(sock, ERR_LOGINS, sizeof(ERR_LOGINS) - 1, 0) < 0)
         {
-        WriteServLog("send ERR_LOGIN error in SendLoginAnswer.");
+        logger("send ERR_LOGIN error in SendLoginAnswer.");
         return -1;
         }
     }
@@ -416,7 +416,7 @@ else
     {
     if (send(sock, OK_LOGINS, sizeof(OK_LOGINS) - 1, 0) < 0)
         {
-        WriteServLog("send OK_LOGINS error in SendLoginSAnswer.");
+        logger("send OK_LOGINS error in SendLoginSAnswer.");
         return -1;
         }
     }
@@ -461,7 +461,7 @@ while (1)
         }
 
     char buffer[8];
-    buffer[8] = 0;
+    buffer[7] = 0;
 
     DecodeString(buffer, bufferS, &ctx);
     requestList.push_back(std::string(buffer, pos));
@@ -537,6 +537,6 @@ answerList.push_back(s);
 //-----------------------------------------------------------------------------
 void CONFIGPROTO::WriteLogAccessFailed(uint32_t ip)
 {
-WriteServLog("Admin's connect failed. IP %s", inet_ntostring(ip).c_str());
+logger("Admin's connect failed. IP %s", inet_ntostring(ip).c_str());
 }
 //-----------------------------------------------------------------------------